kallithea Changeset - 4df61d1bd2d5

Changeset - 4df61d1bd2d5

Parent rev.

Child rev.

[Not reviewed]

default

0 12 0

Mads Kiilerich - 11 years ago 2014-08-01 20:28:42
madski@unity3d.com

spelling: let's call it 'whitespace' without space or hyphen

12 files changed with 35 insertions and 35 deletions:

kallithea/controllers/changeset.py

kallithea/i18n/de/LC_MESSAGES/kallithea.po

kallithea/i18n/en/LC_MESSAGES/kallithea.po

kallithea/i18n/fr/LC_MESSAGES/kallithea.po

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

kallithea/i18n/kallithea.pot

kallithea/i18n/pl/LC_MESSAGES/kallithea.po

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

kallithea/i18n/ru/LC_MESSAGES/kallithea.po

kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po

kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po

kallithea/templates/files/diff_2way.html

0 comments (0 inline, 0 general)

kallithea/controllers/changeset.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 kallithea.controllers.changeset
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 changeset controller for pylons showoing changes beetween
 revisions
 This file was forked by the Kallithea project in July 2014.
 Original author and date, and relevant copyright and licensing information is below:
 :created_on: Apr 25, 2010
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import logging
 import traceback
 from collections import defaultdict
 from webob.exc import HTTPForbidden, HTTPBadRequest, HTTPNotFound
 from pylons import tmpl_context as c, url, request, response
 from pylons.i18n.translation import _
 from pylons.controllers.util import redirect
 from kallithea.lib.utils import jsonify
 from kallithea.lib.vcs.exceptions import RepositoryError, \
     ChangesetDoesNotExistError
 from kallithea.lib.compat import json
 import kallithea.lib.helpers as h
 from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator,\
     NotAnonymous
 from kallithea.lib.base import BaseRepoController, render
 from kallithea.lib.utils import action_logger
 from kallithea.lib.compat import OrderedDict
 from kallithea.lib import diffs
 from kallithea.model.db import ChangesetComment, ChangesetStatus
 from kallithea.model.comment import ChangesetCommentsModel
 from kallithea.model.changeset_status import ChangesetStatusModel
 from kallithea.model.meta import Session
 from kallithea.model.repo import RepoModel
 from kallithea.lib.diffs import LimitedDiffContainer
 from kallithea.lib.exceptions import StatusChangeOnClosedPullRequestError
 from kallithea.lib.vcs.backends.base import EmptyChangeset
 from kallithea.lib.utils2 import safe_unicode, safe_str
 from kallithea.lib.graphmod import graph_data
 log = logging.getLogger(__name__)
 def _update_with_GET(params, GET):
     for k in ['diff1', 'diff2', 'diff']:
         params[k] += GET.getall(k)
 def anchor_url(revision, path, GET):
     fid = h.FID(revision, path)
     return h.url.current(anchor=fid, **dict(GET))
 def get_ignore_ws(fid, GET):
     ig_ws_global = GET.get('ignorews')
     ig_ws = filter(lambda k: k.startswith('WS'), GET.getall(fid))
     if ig_ws:
         try:
             return int(ig_ws[0].split(':')[-1])
         except Exception:
             pass
     return ig_ws_global
 def _ignorews_url(GET, fileid=None):
     fileid = str(fileid) if fileid else None
     params = defaultdict(list)
     _update_with_GET(params, GET)
-    lbl = _('Show white space')
+    lbl = _('Show whitespace')
     ig_ws = get_ignore_ws(fileid, GET)
     ln_ctx = get_line_ctx(fileid, GET)
     # global option
     if fileid is None:
         if ig_ws is None:
             params['ignorews'] += [1]
-            lbl = _('Ignore white space')
+            lbl = _('Ignore whitespace')
         ctx_key = 'context'
         ctx_val = ln_ctx
     # per file options
     else:
         if ig_ws is None:
             params[fileid] += ['WS:1']
-            lbl = _('Ignore white space')
+            lbl = _('Ignore whitespace')
         ctx_key = fileid
         ctx_val = 'C:%s' % ln_ctx
     # if we have passed in ln_ctx pass it along to our params
     if ln_ctx:
         params[ctx_key] += [ctx_val]
     params['anchor'] = fileid
     img = h.image(h.url('/images/icons/text_strikethrough.png'), lbl, class_='icon')
     return h.link_to(img, h.url.current(**params), title=lbl, class_='tooltip')
 def get_line_ctx(fid, GET):
     ln_ctx_global = GET.get('context')
     if fid:
         ln_ctx = filter(lambda k: k.startswith('C'), GET.getall(fid))
     else:
         _ln_ctx = filter(lambda k: k.startswith('C'), GET)
         ln_ctx = GET.get(_ln_ctx[0]) if _ln_ctx  else ln_ctx_global
         if ln_ctx:
             ln_ctx = [ln_ctx]
     if ln_ctx:
         retval = ln_ctx[0].split(':')[-1]
     else:
         retval = ln_ctx_global
     try:
         return int(retval)
     except Exception:
         return 3
 def _context_url(GET, fileid=None):
     """
     Generates url for context lines
     :param fileid:
     """
     fileid = str(fileid) if fileid else None
     ig_ws = get_ignore_ws(fileid, GET)
     ln_ctx = (get_line_ctx(fileid, GET) or 3) * 2
     params = defaultdict(list)
     _update_with_GET(params, GET)
     # global option
     if fileid is None:
         if ln_ctx > 0:
             params['context'] += [ln_ctx]
         if ig_ws:
             ig_ws_key = 'ignorews'
             ig_ws_val = 1
     # per file option
     else:
         params[fileid] += ['C:%s' % ln_ctx]
         ig_ws_key = fileid
         ig_ws_val = 'WS:%s' % 1
     if ig_ws:
         params[ig_ws_key] += [ig_ws_val]
     lbl = _('increase diff context to %(num)s lines') % {'num': ln_ctx}
     params['anchor'] = fileid
     img = h.image(h.url('/images/icons/table_add.png'), lbl, class_='icon')
     return h.link_to(img, h.url.current(**params), title=lbl, class_='tooltip')
 class ChangesetController(BaseRepoController):
     def __before__(self):
         super(ChangesetController, self).__before__()
         c.affected_files_cut_off = 60
     def __load_data(self):
         repo_model = RepoModel()
         c.users_array = repo_model.get_users_js()
         c.user_groups_array = repo_model.get_user_groups_js()
     def _index(self, revision, method):
         c.anchor_url = anchor_url
         c.ignorews_url = _ignorews_url
         c.context_url = _context_url
         c.fulldiff = fulldiff = request.GET.get('fulldiff')
         #get ranges of revisions if preset
         rev_range = revision.split('...')[:2]
         enable_comments = True
         c.cs_repo = c.db_repo
         try:
             if len(rev_range) == 2:
                 enable_comments = False
                 rev_start = rev_range[0]

kallithea/i18n/de/LC_MESSAGES/kallithea.po

➞

Show inline comments

 # German translations for Kallithea.
 # Copyright (C) 2014 RhodeCode GmbH, and others.
 # This file is distributed under the same license as the Kallithea project.
 # Translators:
 # stephanj <info@stephan-jauernick.de>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version:  Kallithea\n"
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 "POT-Creation-Date: 2014-07-02 19:08-0400\n"
 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 "Language-Team: German "
 "(http://www.transifex.com/projects/p/Kallithea/language/de/)\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 #: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90
 #: kallithea/controllers/pullrequests.py:265
 msgid "There are no changesets yet"
 msgstr ""
 #: kallithea/controllers/changelog.py:186
 msgid "All Branches"
 msgstr "Alle Branches"
 #: kallithea/controllers/changelog.py:189
 msgid "(closed)"
 msgstr ""
 #: kallithea/controllers/changeset.py:87
-msgid "Show white space"
+msgid "Show whitespace"
 msgstr ""
 #: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
-msgid "Ignore white space"
+msgid "Ignore whitespace"
 msgstr ""
 #: kallithea/controllers/changeset.py:167
 #, python-format
 msgid "increase diff context to %(num)s lines"
 msgstr ""
 #: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98
 #: kallithea/controllers/files.py:121
 msgid "Such revision does not exist for this repository"
 msgstr ""
 #: kallithea/controllers/changeset.py:355
 #: kallithea/controllers/pullrequests.py:482
 #, python-format
 msgid "Status change -> %s"
 msgstr ""
 #: kallithea/controllers/changeset.py:386
 msgid ""
 "Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr ""
 #: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65
 msgid "Select changeset"
 msgstr ""
 #: kallithea/controllers/error.py:72
 msgid "Home page"
 msgstr "Startseite"
 #: kallithea/controllers/error.py:101
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr ""
 "Die Anfrage konnte vom Server nicht ausgewertet werden weil sie einen "
 "Ungültigen Syntax nutzt"
 #: kallithea/controllers/error.py:104
 msgid "Unauthorized access to resource"
 msgstr "Unauthorisierter Zugang zur Ressource"
 #: kallithea/controllers/error.py:106
 msgid "You don't have permission to view this page"
 msgstr "Du hast keine Rechte um diese Seite zu betrachten"
 #: kallithea/controllers/error.py:108
 msgid "The resource could not be found"
 msgstr "Die Ressource konnte nicht gefunden werden"
 #: kallithea/controllers/error.py:110
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr ""
 "Aufgrund einer Unerwarteten Gegebenheit konnte der Server diese Anfrage "
 "nicht vollenden"
 #: kallithea/controllers/feed.py:55
 #, python-format
 msgid "Changes on %s repository"
 msgstr "Änderungen im %s Repository"
 #: kallithea/controllers/feed.py:56
 #, python-format
 msgid "%s %s feed"
 msgstr "%s %s Feed"
 #: kallithea/controllers/feed.py:89
 #: kallithea/templates/changeset/changeset.html:139
 #: kallithea/templates/changeset/changeset.html:151
 #: kallithea/templates/compare/compare_diff.html:75
 #: kallithea/templates/compare/compare_diff.html:85
 #: kallithea/templates/pullrequests/pullrequest_show.html:178
 #: kallithea/templates/pullrequests/pullrequest_show.html:202
 msgid "Changeset was too big and was cut off..."
 msgstr ""
 #: kallithea/controllers/feed.py:93
 #, python-format
 msgid "%s committed on %s"
 msgstr ""
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr ""
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
 msgid "This repository is has been locked by %s on %s"
@@ @@ -4940,193 +4940,193 @@ msgstr "" @@
 msgid "No changesets yet"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "Abonniere den %s RSS Feed"
 #: kallithea/templates/data_table/_dt_elements.html:111
 #: kallithea/templates/data_table/_dt_elements.html:113
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "Abonniere den %s ATOM Feed"
 #: kallithea/templates/data_table/_dt_elements.html:141
 msgid "Creating"
 msgstr ""
 #: kallithea/templates/email_templates/changeset_comment.html:6
 #, python-format
 msgid "%s commented on a %s changeset."
 msgstr ""
 #: kallithea/templates/email_templates/changeset_comment.html:9
 msgid "The changeset status was changed to"
 msgstr ""
 #: kallithea/templates/email_templates/main.html:8
 msgid "This is a notification from Kallithea."
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:4
 #, python-format
 msgid "Hello %s"
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:5
 msgid "We received a request to create a new password for your account."
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:6
 msgid "You can generate it by clicking following URL"
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:10
 msgid "Please ignore this email if you did not request a new password ."
 msgstr ""
 #: kallithea/templates/email_templates/pull_request.html:6
 #, python-format
 msgid ""
 "%s opened a pull request for repository %s and wants you to review "
 "changes."
 msgstr ""
 #: kallithea/templates/email_templates/pull_request.html:8
 #: kallithea/templates/pullrequests/pullrequest.html:31
 #: kallithea/templates/pullrequests/pullrequest_data.html:14
 #: kallithea/templates/pullrequests/pullrequest_show.html:28
 msgid "Title"
 msgstr ""
 #: kallithea/templates/email_templates/pull_request_comment.html:6
 #, python-format
 msgid "%s commented on pull request \"%s\""
 msgstr ""
 #: kallithea/templates/email_templates/pull_request_comment.html:10
 msgid "Pull request was closed with status"
 msgstr ""
 #: kallithea/templates/email_templates/pull_request_comment.html:12
 msgid "Pull request changed status"
 msgstr ""
 #: kallithea/templates/email_templates/registration.html:6
 msgid "View this user here"
 msgstr ""
 #: kallithea/templates/errors/error_document.html:47
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:15
 #, python-format
 msgid "%s File side-by-side diff"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:22
 #: kallithea/templates/files/file_diff.html:11
 msgid "File diff"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:58
-msgid "ignore white space"
+msgid "ignore whitespace"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:59
 msgid "turn on edit mode"
 msgstr ""
 #: kallithea/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File Diff"
 msgstr ""
 #: kallithea/templates/files/files.html:4
 #: kallithea/templates/files/files.html:84
 #, python-format
 msgid "%s Files"
 msgstr ""
 #: kallithea/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr ""
 #: kallithea/templates/files/files_add.html:25
 msgid "Add new file"
 msgstr ""
 #: kallithea/templates/files/files_add.html:45
 #: kallithea/templates/files/files_edit.html:43
 #: kallithea/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr ""
 #: kallithea/templates/files/files_add.html:47
 msgid "Enter filename..."
 msgstr ""
 #: kallithea/templates/files/files_add.html:49
 #: kallithea/templates/files/files_add.html:53
 msgid "or"
 msgstr ""
 #: kallithea/templates/files/files_add.html:49
 msgid "Upload File"
 msgstr ""
 #: kallithea/templates/files/files_add.html:53
 msgid "Create New File"
 msgstr ""
 #: kallithea/templates/files/files_add.html:58
 msgid "New file mode"
 msgstr ""
 #: kallithea/templates/files/files_add.html:69
 #: kallithea/templates/files/files_delete.html:57
 #: kallithea/templates/files/files_edit.html:72
 msgid "Commit changes"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:13
 msgid "revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:14
 msgid "Previous revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:16
 msgid "Next revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:22
 msgid "Follow current branch"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:25
 msgid "Search File List"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:29
 msgid "Loading file list..."
 msgstr ""
 #: kallithea/templates/files/files_browser.html:42
 msgid "Size"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:43
 msgid "Mimetype"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:44
 msgid "Last Revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:45

kallithea/i18n/en/LC_MESSAGES/kallithea.po

➞

Show inline comments

 # English translations for Kallithea.
 # Copyright (C) 2010 ORGANIZATION
 # This file is distributed under the same license as the Kallithea project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Kallithea 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2014-07-02 19:08-0400\n"
 "PO-Revision-Date: 2011-02-25 19:13+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 #: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90
 #: kallithea/controllers/pullrequests.py:265
 msgid "There are no changesets yet"
 msgstr ""
 #: kallithea/controllers/changelog.py:186
 msgid "All Branches"
 msgstr ""
 #: kallithea/controllers/changelog.py:189
 msgid "(closed)"
 msgstr ""
 #: kallithea/controllers/changeset.py:87
-msgid "Show white space"
+msgid "Show whitespace"
 msgstr ""
 #: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
-msgid "Ignore white space"
+msgid "Ignore whitespace"
 msgstr ""
 #: kallithea/controllers/changeset.py:167
 #, python-format
 msgid "increase diff context to %(num)s lines"
 msgstr ""
 #: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98
 #: kallithea/controllers/files.py:121
 msgid "Such revision does not exist for this repository"
 msgstr ""
 #: kallithea/controllers/changeset.py:355
 #: kallithea/controllers/pullrequests.py:482
 #, python-format
 msgid "Status change -> %s"
 msgstr ""
 #: kallithea/controllers/changeset.py:386
 msgid ""
 "Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr ""
 #: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65
 #, fuzzy
 msgid "Select changeset"
 msgstr ""
 #: kallithea/controllers/error.py:72
 msgid "Home page"
 msgstr ""
 #: kallithea/controllers/error.py:101
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr ""
 #: kallithea/controllers/error.py:104
 msgid "Unauthorized access to resource"
 msgstr ""
 #: kallithea/controllers/error.py:106
 msgid "You don't have permission to view this page"
 msgstr ""
 #: kallithea/controllers/error.py:108
 msgid "The resource could not be found"
 msgstr ""
 #: kallithea/controllers/error.py:110
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr ""
 #: kallithea/controllers/feed.py:55
 #, python-format
 msgid "Changes on %s repository"
 msgstr ""
 #: kallithea/controllers/feed.py:56
 #, python-format
 msgid "%s %s feed"
 msgstr ""
 #: kallithea/controllers/feed.py:89
 #: kallithea/templates/changeset/changeset.html:139
 #: kallithea/templates/changeset/changeset.html:151
 #: kallithea/templates/compare/compare_diff.html:75
 #: kallithea/templates/compare/compare_diff.html:85
 #: kallithea/templates/pullrequests/pullrequest_show.html:178
 #: kallithea/templates/pullrequests/pullrequest_show.html:202
 msgid "Changeset was too big and was cut off..."
 msgstr ""
 #: kallithea/controllers/feed.py:93
 #, python-format
 msgid "%s committed on %s"
 msgstr ""
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr ""
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr ""
 #: kallithea/controllers/files.py:313
@@ @@ -4923,193 +4923,193 @@ msgstr "" @@
 msgid "No changesets yet"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:111
 #: kallithea/templates/data_table/_dt_elements.html:113
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:141
 msgid "Creating"
 msgstr ""
 #: kallithea/templates/email_templates/changeset_comment.html:6
 #, python-format
 msgid "%s commented on a %s changeset."
 msgstr ""
 #: kallithea/templates/email_templates/changeset_comment.html:9
 msgid "The changeset status was changed to"
 msgstr ""
 #: kallithea/templates/email_templates/main.html:8
 msgid "This is a notification from Kallithea."
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:4
 #, python-format
 msgid "Hello %s"
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:5
 msgid "We received a request to create a new password for your account."
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:6
 msgid "You can generate it by clicking following URL"
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:10
 msgid "Please ignore this email if you did not request a new password ."
 msgstr ""
 #: kallithea/templates/email_templates/pull_request.html:6
 #, python-format
 msgid ""
 "%s opened a pull request for repository %s and wants you to review "
 "changes."
 msgstr ""
 #: kallithea/templates/email_templates/pull_request.html:8
 #: kallithea/templates/pullrequests/pullrequest.html:31
 #: kallithea/templates/pullrequests/pullrequest_data.html:14
 #: kallithea/templates/pullrequests/pullrequest_show.html:28
 msgid "Title"
 msgstr ""
 #: kallithea/templates/email_templates/pull_request_comment.html:6
 #, python-format
 msgid "%s commented on pull request \"%s\""
 msgstr ""
 #: kallithea/templates/email_templates/pull_request_comment.html:10
 msgid "Pull request was closed with status"
 msgstr ""
 #: kallithea/templates/email_templates/pull_request_comment.html:12
 msgid "Pull request changed status"
 msgstr ""
 #: kallithea/templates/email_templates/registration.html:6
 msgid "View this user here"
 msgstr ""
 #: kallithea/templates/errors/error_document.html:47
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:15
 #, python-format
 msgid "%s File side-by-side diff"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:22
 #: kallithea/templates/files/file_diff.html:11
 msgid "File diff"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:58
-msgid "ignore white space"
+msgid "ignore whitespace"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:59
 msgid "turn on edit mode"
 msgstr ""
 #: kallithea/templates/files/file_diff.html:4
 #, fuzzy, python-format
 msgid "%s File Diff"
 msgstr ""
 #: kallithea/templates/files/files.html:4
 #: kallithea/templates/files/files.html:84
 #, fuzzy, python-format
 msgid "%s Files"
 msgstr ""
 #: kallithea/templates/files/files_add.html:4
 #, fuzzy, python-format
 msgid "%s Files Add"
 msgstr ""
 #: kallithea/templates/files/files_add.html:25
 msgid "Add new file"
 msgstr ""
 #: kallithea/templates/files/files_add.html:45
 #: kallithea/templates/files/files_edit.html:43
 #: kallithea/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr ""
 #: kallithea/templates/files/files_add.html:47
 msgid "Enter filename..."
 msgstr ""
 #: kallithea/templates/files/files_add.html:49
 #: kallithea/templates/files/files_add.html:53
 msgid "or"
 msgstr ""
 #: kallithea/templates/files/files_add.html:49
 msgid "Upload File"
 msgstr ""
 #: kallithea/templates/files/files_add.html:53
 msgid "Create New File"
 msgstr ""
 #: kallithea/templates/files/files_add.html:58
 msgid "New file mode"
 msgstr ""
 #: kallithea/templates/files/files_add.html:69
 #: kallithea/templates/files/files_delete.html:57
 #: kallithea/templates/files/files_edit.html:72
 msgid "Commit changes"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:13
 msgid "revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:14
 msgid "Previous revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:16
 msgid "Next revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:22
 msgid "Follow current branch"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:25
 msgid "Search File List"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:29
 msgid "Loading file list..."
 msgstr ""
 #: kallithea/templates/files/files_browser.html:42
 msgid "Size"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:43
 msgid "Mimetype"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:44
 msgid "Last Revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:45

kallithea/i18n/fr/LC_MESSAGES/kallithea.po

➞

Show inline comments

 # French translations for Kallithea.
 # Copyright (C) 2014 RhodeCode GmbH, and others.
 # This file is distributed under the same license as the Kallithea project.
 # Translators:
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version:  Kallithea\n"
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 "POT-Creation-Date: 2014-07-02 19:08-0400\n"
 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 "Language-Team: French "
 "(http://www.transifex.com/projects/p/Kallithea/language/fr/)\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 #: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90
 #: kallithea/controllers/pullrequests.py:265
 msgid "There are no changesets yet"
 msgstr "Il n’y a aucun changement pour le moment"
 #: kallithea/controllers/changelog.py:186
 msgid "All Branches"
 msgstr "Toutes les branches"
 #: kallithea/controllers/changelog.py:189
 msgid "(closed)"
 msgstr ""
 #: kallithea/controllers/changeset.py:87
-msgid "Show white space"
+msgid "Show whitespace"
 msgstr "Afficher les espaces et tabulations"
 #: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
-msgid "Ignore white space"
+msgid "Ignore whitespace"
 msgstr "Ignorer les espaces et tabulations"
 #: kallithea/controllers/changeset.py:167
 #, python-format
 msgid "increase diff context to %(num)s lines"
 msgstr ""
 #: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98
 #: kallithea/controllers/files.py:121
 msgid "Such revision does not exist for this repository"
 msgstr ""
 #: kallithea/controllers/changeset.py:355
 #: kallithea/controllers/pullrequests.py:482
 #, python-format
 msgid "Status change -> %s"
 msgstr "Changement de statut -> %s"
 #: kallithea/controllers/changeset.py:386
 msgid ""
 "Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr ""
 #: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65
 msgid "Select changeset"
 msgstr ""
 #: kallithea/controllers/error.py:72
 msgid "Home page"
 msgstr "Accueil"
 #: kallithea/controllers/error.py:101
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr ""
 "Le serveur n’a pas pu interpréter la requête à cause d’une erreur de "
 "syntaxe"
 #: kallithea/controllers/error.py:104
 msgid "Unauthorized access to resource"
 msgstr "Accès interdit à cet ressource"
 #: kallithea/controllers/error.py:106
 msgid "You don't have permission to view this page"
 msgstr "Vous n’avez pas la permission de voir cette page"
 #: kallithea/controllers/error.py:108
 msgid "The resource could not be found"
 msgstr "Ressource introuvable"
 #: kallithea/controllers/error.py:110
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr ""
 "La requête n’a pu être traitée en raison d’une erreur survenue sur le "
 "serveur."
 #: kallithea/controllers/feed.py:55
 #, python-format
 msgid "Changes on %s repository"
 msgstr "Changements sur le dépôt %s"
 #: kallithea/controllers/feed.py:56
 #, python-format
 msgid "%s %s feed"
 msgstr "Flux %s de %s"
 #: kallithea/controllers/feed.py:89
 #: kallithea/templates/changeset/changeset.html:139
 #: kallithea/templates/changeset/changeset.html:151
 #: kallithea/templates/compare/compare_diff.html:75
 #: kallithea/templates/compare/compare_diff.html:85
 #: kallithea/templates/pullrequests/pullrequest_show.html:178
 #: kallithea/templates/pullrequests/pullrequest_show.html:202
 msgid "Changeset was too big and was cut off..."
 msgstr "Cet ensemble de changements était trop important et a été découpé…"
 #: kallithea/controllers/feed.py:93
 #, python-format
 msgid "%s committed on %s"
 msgstr "%s a commité, le %s"
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr "Ajouter un nouveau fichier"
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
 msgid "This repository is has been locked by %s on %s"
@@ @@ -4956,193 +4956,193 @@ msgstr "" @@
 msgid "No changesets yet"
 msgstr "Dépôt vide"
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "S’abonner au flux RSS de %s"
 #: kallithea/templates/data_table/_dt_elements.html:111
 #: kallithea/templates/data_table/_dt_elements.html:113
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "S’abonner au flux ATOM de %s"
 #: kallithea/templates/data_table/_dt_elements.html:141
 msgid "Creating"
 msgstr ""
 #: kallithea/templates/email_templates/changeset_comment.html:6
 #, python-format
 msgid "%s commented on a %s changeset."
 msgstr ""
 #: kallithea/templates/email_templates/changeset_comment.html:9
 msgid "The changeset status was changed to"
 msgstr ""
 #: kallithea/templates/email_templates/main.html:8
 msgid "This is a notification from Kallithea."
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:4
 #, python-format
 msgid "Hello %s"
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:5
 msgid "We received a request to create a new password for your account."
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:6
 msgid "You can generate it by clicking following URL"
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:10
 msgid "Please ignore this email if you did not request a new password ."
 msgstr ""
 #: kallithea/templates/email_templates/pull_request.html:6
 #, python-format
 msgid ""
 "%s opened a pull request for repository %s and wants you to review "
 "changes."
 msgstr ""
 #: kallithea/templates/email_templates/pull_request.html:8
 #: kallithea/templates/pullrequests/pullrequest.html:31
 #: kallithea/templates/pullrequests/pullrequest_data.html:14
 #: kallithea/templates/pullrequests/pullrequest_show.html:28
 msgid "Title"
 msgstr "Titre"
 #: kallithea/templates/email_templates/pull_request_comment.html:6
 #, python-format
 msgid "%s commented on pull request \"%s\""
 msgstr ""
 #: kallithea/templates/email_templates/pull_request_comment.html:10
 msgid "Pull request was closed with status"
 msgstr ""
 #: kallithea/templates/email_templates/pull_request_comment.html:12
 msgid "Pull request changed status"
 msgstr ""
 #: kallithea/templates/email_templates/registration.html:6
 msgid "View this user here"
 msgstr ""
 #: kallithea/templates/errors/error_document.html:47
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr "Vous serez redirigé vers %s dans %s secondes."
 #: kallithea/templates/files/diff_2way.html:15
 #, python-format
 msgid "%s File side-by-side diff"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:22
 #: kallithea/templates/files/file_diff.html:11
 msgid "File diff"
 msgstr "Diff de fichier"
 #: kallithea/templates/files/diff_2way.html:58
-msgid "ignore white space"
+msgid "ignore whitespace"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:59
 msgid "turn on edit mode"
 msgstr ""
 #: kallithea/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File Diff"
 msgstr ""
 #: kallithea/templates/files/files.html:4
 #: kallithea/templates/files/files.html:84
 #, python-format
 msgid "%s Files"
 msgstr "Fichiers de %s"
 #: kallithea/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr ""
 #: kallithea/templates/files/files_add.html:25
 msgid "Add new file"
 msgstr "Ajouter un nouveau fichier"
 #: kallithea/templates/files/files_add.html:45
 #: kallithea/templates/files/files_edit.html:43
 #: kallithea/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr "Emplacement"
 #: kallithea/templates/files/files_add.html:47
 msgid "Enter filename..."
 msgstr ""
 #: kallithea/templates/files/files_add.html:49
 #: kallithea/templates/files/files_add.html:53
 msgid "or"
 msgstr "ou"
 #: kallithea/templates/files/files_add.html:49
 msgid "Upload File"
 msgstr ""
 #: kallithea/templates/files/files_add.html:53
 msgid "Create New File"
 msgstr ""
 #: kallithea/templates/files/files_add.html:58
 msgid "New file mode"
 msgstr ""
 #: kallithea/templates/files/files_add.html:69
 #: kallithea/templates/files/files_delete.html:57
 #: kallithea/templates/files/files_edit.html:72
 msgid "Commit changes"
 msgstr "Commiter les changements"
 #: kallithea/templates/files/files_browser.html:13
 msgid "revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:14
 msgid "Previous revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:16
 msgid "Next revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:22
 msgid "Follow current branch"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:25
 msgid "Search File List"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:29
 msgid "Loading file list..."
 msgstr "Chargement de la liste des fichiers…"
 #: kallithea/templates/files/files_browser.html:42
 msgid "Size"
 msgstr "Taille"
 #: kallithea/templates/files/files_browser.html:43
 msgid "Mimetype"
 msgstr "Type MIME"
 #: kallithea/templates/files/files_browser.html:44
 msgid "Last Revision"
 msgstr "Dernière révision"
 #: kallithea/templates/files/files_browser.html:45

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

➞

Show inline comments

 # Japanese translations for Kallithea.
 # Copyright (C) 2014 RhodeCode GmbH, and others.
 # This file is distributed under the same license as the Kallithea project.
 # Translators:
 # しろう, 2013
 # shirou - しろう, 2013
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 # こいんとす <tkondou@gmail.com>, 2013
 # Takumi IINO <trot.thunder@gmail.com>, 2013
 # whosaysni <whosaysni@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version:  Kallithea\n"
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 "POT-Creation-Date: 2014-07-02 19:08-0400\n"
 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 "Language-Team: Japanese "
 "(http://www.transifex.com/projects/p/Kallithea/language/ja/)\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 #: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90
 #: kallithea/controllers/pullrequests.py:265
 msgid "There are no changesets yet"
 msgstr "まだチェンジセットがありません"
 #: kallithea/controllers/changelog.py:186
 msgid "All Branches"
 msgstr "すべてのブランチ"
 #: kallithea/controllers/changelog.py:189
 msgid "(closed)"
 msgstr "(閉鎖済み)"
 #: kallithea/controllers/changeset.py:87
-msgid "Show white space"
+msgid "Show whitespace"
 msgstr "空白を表示"
 #: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
-msgid "Ignore white space"
+msgid "Ignore whitespace"
 msgstr "空白を無視"
 #: kallithea/controllers/changeset.py:167
 #, python-format
 msgid "increase diff context to %(num)s lines"
 msgstr "diff コンテキストを %(num)s 行増やす"
 #: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98
 #: kallithea/controllers/files.py:121
 msgid "Such revision does not exist for this repository"
 msgstr "お探しのリビジョンはこのリポジトリにはありません"
 #: kallithea/controllers/changeset.py:355
 #: kallithea/controllers/pullrequests.py:482
 #, python-format
 msgid "Status change -> %s"
 msgstr "ステータス変更 -> %s"
 #: kallithea/controllers/changeset.py:386
 msgid ""
 "Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr "クローズしたプルリクエストに関連するチェンジセットのステータスを変更することは許可されていません"
 #: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65
 msgid "Select changeset"
 msgstr "リビジョンを選択"
 #: kallithea/controllers/error.py:72
 msgid "Home page"
 msgstr "ホームページ"
 #: kallithea/controllers/error.py:101
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr "形式が間違っているため、サーバーはリクエストを処理できませんでした"
 #: kallithea/controllers/error.py:104
 msgid "Unauthorized access to resource"
 msgstr "リソースにアクセスする権限がありません"
 #: kallithea/controllers/error.py:106
 msgid "You don't have permission to view this page"
 msgstr "このページを閲覧する権限がありません"
 #: kallithea/controllers/error.py:108
 msgid "The resource could not be found"
 msgstr "リソースが見つかりません"
 #: kallithea/controllers/error.py:110
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr "サーバーが不正な状態になったため、リクエストに答えることができませんでした。"
 #: kallithea/controllers/feed.py:55
 #, python-format
 msgid "Changes on %s repository"
 msgstr "%s リポジトリでの変更"
 #: kallithea/controllers/feed.py:56
 #, python-format
 msgid "%s %s feed"
 msgstr "%s %s フィード"
 #: kallithea/controllers/feed.py:89
 #: kallithea/templates/changeset/changeset.html:139
 #: kallithea/templates/changeset/changeset.html:151
 #: kallithea/templates/compare/compare_diff.html:75
 #: kallithea/templates/compare/compare_diff.html:85
 #: kallithea/templates/pullrequests/pullrequest_show.html:178
 #: kallithea/templates/pullrequests/pullrequest_show.html:202
 msgid "Changeset was too big and was cut off..."
 msgstr "チェンジセットが大きすぎるため、省略しました"
 #: kallithea/controllers/feed.py:93
 #, python-format
 msgid "%s committed on %s"
 msgstr "%s が %s にコミット"
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr "新しいファイルを追加"
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr "まだファイルがありません。 %s"
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr "このリポジトリは %s によって %s にロックされました"
 #: kallithea/controllers/files.py:313
 msgid "You can only delete files with revision being a valid branch "
@@ @@ -4937,193 +4937,193 @@ msgstr "リポジトリを作成しています..." @@
 msgid "No changesets yet"
 msgstr "まだチェンジセットがありません"
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "%s の RSS フィードを購読"
 #: kallithea/templates/data_table/_dt_elements.html:111
 #: kallithea/templates/data_table/_dt_elements.html:113
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "%s の ATOM フィードを購読"
 #: kallithea/templates/data_table/_dt_elements.html:141
 msgid "Creating"
 msgstr "作成中"
 #: kallithea/templates/email_templates/changeset_comment.html:6
 #, python-format
 msgid "%s commented on a %s changeset."
 msgstr "%s が %s のチェンジセットにコメント"
 #: kallithea/templates/email_templates/changeset_comment.html:9
 msgid "The changeset status was changed to"
 msgstr "チェンジセットを次に変更"
 #: kallithea/templates/email_templates/main.html:8
 msgid "This is a notification from Kallithea."
 msgstr "Kallitheaからの通知です"
 #: kallithea/templates/email_templates/password_reset.html:4
 #, python-format
 msgid "Hello %s"
 msgstr "こんにちは %s"
 #: kallithea/templates/email_templates/password_reset.html:5
 msgid "We received a request to create a new password for your account."
 msgstr "アカウントの新しいパスワードの生成リクエストを受け取りました。"
 #: kallithea/templates/email_templates/password_reset.html:6
 msgid "You can generate it by clicking following URL"
 msgstr "下のURLをクリックすることで再生成が行えます。"
 #: kallithea/templates/email_templates/password_reset.html:10
 msgid "Please ignore this email if you did not request a new password ."
 msgstr "新しいパスワードを生成しない場合はこのメールを無視してください。"
 #: kallithea/templates/email_templates/pull_request.html:6
 #, python-format
 msgid ""
 "%s opened a pull request for repository %s and wants you to review "
 "changes."
 msgstr "ユーザ %s がリポジトリ %s で新しいプルリクエストを作成しました。変更をレビューしてください。"
 #: kallithea/templates/email_templates/pull_request.html:8
 #: kallithea/templates/pullrequests/pullrequest.html:31
 #: kallithea/templates/pullrequests/pullrequest_data.html:14
 #: kallithea/templates/pullrequests/pullrequest_show.html:28
 msgid "Title"
 msgstr "タイトル"
 #: kallithea/templates/email_templates/pull_request_comment.html:6
 #, python-format
 msgid "%s commented on pull request \"%s\""
 msgstr "%s がプルリクエスト\"%s\" にコメントしました"
 #: kallithea/templates/email_templates/pull_request_comment.html:10
 msgid "Pull request was closed with status"
 msgstr "プルリクエストを以下のステータスで閉じました："
 #: kallithea/templates/email_templates/pull_request_comment.html:12
 msgid "Pull request changed status"
 msgstr "プルリクエストを以下のステータスに変更しました："
 #: kallithea/templates/email_templates/registration.html:6
 msgid "View this user here"
 msgstr "このユーザを閲覧する"
 #: kallithea/templates/errors/error_document.html:47
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr "%s へ %s 秒後にリダイレクトします"
 #: kallithea/templates/files/diff_2way.html:15
 #, python-format
 msgid "%s File side-by-side diff"
 msgstr "%s ファイルの差分を並べて表示"
 #: kallithea/templates/files/diff_2way.html:22
 #: kallithea/templates/files/file_diff.html:11
 msgid "File diff"
 msgstr "ファイル差分"
 #: kallithea/templates/files/diff_2way.html:58
-msgid "ignore white space"
+msgid "ignore whitespace"
 msgstr "空白を無視"
 #: kallithea/templates/files/diff_2way.html:59
 msgid "turn on edit mode"
 msgstr "編集モード"
 #: kallithea/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File Diff"
 msgstr "%s ファイル差分"
 #: kallithea/templates/files/files.html:4
 #: kallithea/templates/files/files.html:84
 #, python-format
 msgid "%s Files"
 msgstr "%s ファイル"
 #: kallithea/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr "%s ファイルを追加"
 #: kallithea/templates/files/files_add.html:25
 msgid "Add new file"
 msgstr "新しいファイルを追加"
 #: kallithea/templates/files/files_add.html:45
 #: kallithea/templates/files/files_edit.html:43
 #: kallithea/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr "場所"
 #: kallithea/templates/files/files_add.html:47
 msgid "Enter filename..."
 msgstr "ファイル名..."
 #: kallithea/templates/files/files_add.html:49
 #: kallithea/templates/files/files_add.html:53
 msgid "or"
 msgstr "または"
 #: kallithea/templates/files/files_add.html:49
 msgid "Upload File"
 msgstr "アップロードファイル"
 #: kallithea/templates/files/files_add.html:53
 msgid "Create New File"
 msgstr "新しいファイルを作成"
 #: kallithea/templates/files/files_add.html:58
 msgid "New file mode"
 msgstr "ファイルモード"
 #: kallithea/templates/files/files_add.html:69
 #: kallithea/templates/files/files_delete.html:57
 #: kallithea/templates/files/files_edit.html:72
 msgid "Commit changes"
 msgstr "変更をコミット"
 #: kallithea/templates/files/files_browser.html:13
 msgid "revision"
 msgstr "リビジョン"
 #: kallithea/templates/files/files_browser.html:14
 msgid "Previous revision"
 msgstr "前のリビジョン"
 #: kallithea/templates/files/files_browser.html:16
 msgid "Next revision"
 msgstr "次のリビジョン"
 #: kallithea/templates/files/files_browser.html:22
 msgid "Follow current branch"
 msgstr "このブランチで追跡"
 #: kallithea/templates/files/files_browser.html:25
 msgid "Search File List"
 msgstr "ファイル一覧を検索"
 #: kallithea/templates/files/files_browser.html:29
 msgid "Loading file list..."
 msgstr "ファイル一覧を読み込み中..."
 #: kallithea/templates/files/files_browser.html:42
 msgid "Size"
 msgstr "サイズ"
 #: kallithea/templates/files/files_browser.html:43
 msgid "Mimetype"
 msgstr "Mimetype"
 #: kallithea/templates/files/files_browser.html:44
 msgid "Last Revision"
 msgstr "最後のリビジョン"
 #: kallithea/templates/files/files_browser.html:45

kallithea/i18n/kallithea.pot

➞

Show inline comments

 # Translations template for Kallithea.
 # Copyright (C) 2014 Various authors, licensing as GPLv3
 # This file is distributed under the same license as the Kallithea project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 ##, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Kallithea 2.2.5\n"
 "Report-Msgid-Bugs-To: marcin@maq.io\n"
 "POT-Creation-Date: 2014-07-02 19:08-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 #: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90
 #: kallithea/controllers/pullrequests.py:265
 msgid "There are no changesets yet"
 msgstr ""
 #: kallithea/controllers/changelog.py:186
 msgid "All Branches"
 msgstr ""
 #: kallithea/controllers/changelog.py:189
 msgid "(closed)"
 msgstr ""
 #: kallithea/controllers/changeset.py:87
-msgid "Show white space"
+msgid "Show whitespace"
 msgstr ""
 #: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
-msgid "Ignore white space"
+msgid "Ignore whitespace"
 msgstr ""
 #: kallithea/controllers/changeset.py:167
 #, python-format
 msgid "increase diff context to %(num)s lines"
 msgstr ""
 #: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98
 #: kallithea/controllers/files.py:121
 msgid "Such revision does not exist for this repository"
 msgstr ""
 #: kallithea/controllers/changeset.py:355
 #: kallithea/controllers/pullrequests.py:482
 #, python-format
 msgid "Status change -> %s"
 msgstr ""
 #: kallithea/controllers/changeset.py:386
 msgid "Changing status on a changeset associated with a closed pull request is not allowed"
 msgstr ""
 #: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65
 msgid "Select changeset"
 msgstr ""
 #: kallithea/controllers/error.py:72
 msgid "Home page"
 msgstr ""
 #: kallithea/controllers/error.py:101
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr ""
 #: kallithea/controllers/error.py:104
 msgid "Unauthorized access to resource"
 msgstr ""
 #: kallithea/controllers/error.py:106
 msgid "You don't have permission to view this page"
 msgstr ""
 #: kallithea/controllers/error.py:108
 msgid "The resource could not be found"
 msgstr ""
 #: kallithea/controllers/error.py:110
 msgid "The server encountered an unexpected condition which prevented it from fulfilling the request."
 msgstr ""
 #: kallithea/controllers/feed.py:55
 #, python-format
 msgid "Changes on %s repository"
 msgstr ""
 #: kallithea/controllers/feed.py:56
 #, python-format
 msgid "%s %s feed"
 msgstr ""
 #: kallithea/controllers/feed.py:89
 #: kallithea/templates/changeset/changeset.html:139
 #: kallithea/templates/changeset/changeset.html:151
 #: kallithea/templates/compare/compare_diff.html:75
 #: kallithea/templates/compare/compare_diff.html:85
 #: kallithea/templates/pullrequests/pullrequest_show.html:178
 #: kallithea/templates/pullrequests/pullrequest_show.html:202
 msgid "Changeset was too big and was cut off..."
 msgstr ""
 #: kallithea/controllers/feed.py:93
 #, python-format
 msgid "%s committed on %s"
 msgstr ""
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr ""
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr ""
 #: kallithea/controllers/files.py:313
 msgid "You can only delete files with revision being a valid branch "
 msgstr ""
 #: kallithea/controllers/files.py:324
 #, python-format
@@ @@ -4801,193 +4801,193 @@ msgstr "" @@
 #: kallithea/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:111
 #: kallithea/templates/data_table/_dt_elements.html:113
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:141
 msgid "Creating"
 msgstr ""
 #: kallithea/templates/email_templates/changeset_comment.html:6
 #, python-format
 msgid "%s commented on a %s changeset."
 msgstr ""
 #: kallithea/templates/email_templates/changeset_comment.html:9
 msgid "The changeset status was changed to"
 msgstr ""
 #: kallithea/templates/email_templates/main.html:8
 msgid "This is a notification from Kallithea."
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:4
 #, python-format
 msgid "Hello %s"
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:5
 msgid "We received a request to create a new password for your account."
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:6
 msgid "You can generate it by clicking following URL"
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:10
 msgid "Please ignore this email if you did not request a new password ."
 msgstr ""
 #: kallithea/templates/email_templates/pull_request.html:6
 #, python-format
 msgid "%s opened a pull request for repository %s and wants you to review changes."
 msgstr ""
 #: kallithea/templates/email_templates/pull_request.html:8
 #: kallithea/templates/pullrequests/pullrequest.html:31
 #: kallithea/templates/pullrequests/pullrequest_data.html:14
 #: kallithea/templates/pullrequests/pullrequest_show.html:28
 msgid "Title"
 msgstr ""
 #: kallithea/templates/email_templates/pull_request_comment.html:6
 #, python-format
 msgid "%s commented on pull request \"%s\""
 msgstr ""
 #: kallithea/templates/email_templates/pull_request_comment.html:10
 msgid "Pull request was closed with status"
 msgstr ""
 #: kallithea/templates/email_templates/pull_request_comment.html:12
 msgid "Pull request changed status"
 msgstr ""
 #: kallithea/templates/email_templates/registration.html:6
 msgid "View this user here"
 msgstr ""
 #: kallithea/templates/errors/error_document.html:47
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:15
 #, python-format
 msgid "%s File side-by-side diff"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:22
 #: kallithea/templates/files/file_diff.html:11
 msgid "File diff"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:58
-msgid "ignore white space"
+msgid "ignore whitespace"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:59
 msgid "turn on edit mode"
 msgstr ""
 #: kallithea/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File Diff"
 msgstr ""
 #: kallithea/templates/files/files.html:4
 #: kallithea/templates/files/files.html:84
 #, python-format
 msgid "%s Files"
 msgstr ""
 #: kallithea/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr ""
 #: kallithea/templates/files/files_add.html:25
 msgid "Add new file"
 msgstr ""
 #: kallithea/templates/files/files_add.html:45
 #: kallithea/templates/files/files_edit.html:43
 #: kallithea/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr ""
 #: kallithea/templates/files/files_add.html:47
 msgid "Enter filename..."
 msgstr ""
 #: kallithea/templates/files/files_add.html:49
 #: kallithea/templates/files/files_add.html:53
 msgid "or"
 msgstr ""
 #: kallithea/templates/files/files_add.html:49
 msgid "Upload File"
 msgstr ""
 #: kallithea/templates/files/files_add.html:53
 msgid "Create New File"
 msgstr ""
 #: kallithea/templates/files/files_add.html:58
 msgid "New file mode"
 msgstr ""
 #: kallithea/templates/files/files_add.html:69
 #: kallithea/templates/files/files_delete.html:57
 #: kallithea/templates/files/files_edit.html:72
 msgid "Commit changes"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:13
 msgid "revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:14
 msgid "Previous revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:16
 msgid "Next revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:22
 msgid "Follow current branch"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:25
 msgid "Search File List"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:29
 msgid "Loading file list..."
 msgstr ""
 #: kallithea/templates/files/files_browser.html:42
 msgid "Size"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:43
 msgid "Mimetype"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:44
 msgid "Last Revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:45

kallithea/i18n/pl/LC_MESSAGES/kallithea.po

➞

Show inline comments

 # Polish translations for Kallithea.
 # Copyright (C) 2014 RhodeCode GmbH, and others.
 # This file is distributed under the same license as the Kallithea project.
 # Translators:
 # Nemcio <areczek01@gmail.com>, 2013
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010
 # marcinkuzminski <marcin@python-blog.com>, 2013
 # Nemcio <bogdan114@g.pl>, 2012
 # Nemcio <areczek01@gmail.com>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version:  Kallithea\n"
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 "POT-Creation-Date: 2014-07-02 19:08-0400\n"
 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 "Language-Team: Polish "
 "(http://www.transifex.com/projects/p/Kallithea/language/pl/)\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && "
 "(n%100<10 || n%100>=20) ? 1 : 2)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 #: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90
 #: kallithea/controllers/pullrequests.py:265
 msgid "There are no changesets yet"
 msgstr "Brak zestawienia zmian"
 #: kallithea/controllers/changelog.py:186
 msgid "All Branches"
 msgstr "Wszystkie gałęzie"
 #: kallithea/controllers/changelog.py:189
 msgid "(closed)"
 msgstr "(zamknięty)"
 #: kallithea/controllers/changeset.py:87
-msgid "Show white space"
+msgid "Show whitespace"
 msgstr "pokazuj spacje"
 #: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
-msgid "Ignore white space"
+msgid "Ignore whitespace"
 msgstr "Ignoruj pokazywanie spacji"
 #: kallithea/controllers/changeset.py:167
 #, python-format
 msgid "increase diff context to %(num)s lines"
 msgstr ""
 #: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98
 #: kallithea/controllers/files.py:121
 msgid "Such revision does not exist for this repository"
 msgstr ""
 #: kallithea/controllers/changeset.py:355
 #: kallithea/controllers/pullrequests.py:482
 #, python-format
 msgid "Status change -> %s"
 msgstr "Zmiana statusu -> %s"
 #: kallithea/controllers/changeset.py:386
 msgid ""
 "Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr ""
 "Zmiana statusu na grupy zmian powiązania łączy zamkniętego wniosku jest "
 "niedozwolona"
 #: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65
 msgid "Select changeset"
 msgstr "Wybrane zmiany"
 #: kallithea/controllers/error.py:72
 msgid "Home page"
 msgstr "Strona główna"
 #: kallithea/controllers/error.py:101
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr ""
 "Wniosek nie może być rozumiany przez serwer z powodu zniekształconej "
 "składni."
 #: kallithea/controllers/error.py:104
 msgid "Unauthorized access to resource"
 msgstr "Nieautoryzowany dostęp do zasobów"
 #: kallithea/controllers/error.py:106
 msgid "You don't have permission to view this page"
 msgstr "Nie masz uprawnień do przeglądania tej strony"
 #: kallithea/controllers/error.py:108
 msgid "The resource could not be found"
 msgstr "Zasób nie został znaleziony"
 #: kallithea/controllers/error.py:110
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr ""
 "Serwer napotkał niespodziewany warunek, który uniemożliwia jej spełnienie"
 " żądania."
 #: kallithea/controllers/feed.py:55
 #, python-format
 msgid "Changes on %s repository"
 msgstr "Zmiany w %s repozytorium"
 #: kallithea/controllers/feed.py:56
 #, python-format
 msgid "%s %s feed"
 msgstr "%s %s zasilać"
 #: kallithea/controllers/feed.py:89
 #: kallithea/templates/changeset/changeset.html:139
 #: kallithea/templates/changeset/changeset.html:151
 #: kallithea/templates/compare/compare_diff.html:75
 #: kallithea/templates/compare/compare_diff.html:85
 #: kallithea/templates/pullrequests/pullrequest_show.html:178
 #: kallithea/templates/pullrequests/pullrequest_show.html:202
 msgid "Changeset was too big and was cut off..."
 msgstr "Lista zmian była zbyt duża i została ucięta..."
 #: kallithea/controllers/feed.py:93
 #, python-format
 msgid "%s committed on %s"
 msgstr "%s zakomitowal w %s"
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr "Kliknij tutaj, by dodać nowy plik"
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
@@ @@ -4996,193 +4996,193 @@ msgstr "Nie ma jeszcze zestawienia zmian @@
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "Subskrybuj %s kanał rss"
 #: kallithea/templates/data_table/_dt_elements.html:111
 #: kallithea/templates/data_table/_dt_elements.html:113
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "Subskrybuj %s kanał atom"
 #: kallithea/templates/data_table/_dt_elements.html:141
 msgid "Creating"
 msgstr ""
 #: kallithea/templates/email_templates/changeset_comment.html:6
 #, python-format
 msgid "%s commented on a %s changeset."
 msgstr "%s komentarzy %s zestawów zmian."
 #: kallithea/templates/email_templates/changeset_comment.html:9
 msgid "The changeset status was changed to"
 msgstr "Status zestawienia zmian został zmieniony na"
 #: kallithea/templates/email_templates/main.html:8
 msgid "This is a notification from Kallithea."
 msgstr "To jest powiadomienie z strony"
 #: kallithea/templates/email_templates/password_reset.html:4
 #, python-format
 msgid "Hello %s"
 msgstr "Witaj %s"
 #: kallithea/templates/email_templates/password_reset.html:5
 msgid "We received a request to create a new password for your account."
 msgstr "Otrzymaliśmy prośbę o utworzenie nowego hasła do twojego konta."
 #: kallithea/templates/email_templates/password_reset.html:6
 msgid "You can generate it by clicking following URL"
 msgstr "Możesz wygenerować nowe hasło klikając w link URL poniżej:"
 #: kallithea/templates/email_templates/password_reset.html:10
 msgid "Please ignore this email if you did not request a new password ."
 msgstr "Proszę zignorować tą wiadomość, jeśli nie poproś o nowe hasło."
 #: kallithea/templates/email_templates/pull_request.html:6
 #, python-format
 msgid ""
 "%s opened a pull request for repository %s and wants you to review "
 "changes."
 msgstr ""
 "%s zgłosił wniosek połączenia w repozytorium %s i chce żeby sprawdzić "
 "zmiany."
 #: kallithea/templates/email_templates/pull_request.html:8
 #: kallithea/templates/pullrequests/pullrequest.html:31
 #: kallithea/templates/pullrequests/pullrequest_data.html:14
 #: kallithea/templates/pullrequests/pullrequest_show.html:28
 msgid "Title"
 msgstr "Tytuł"
 #: kallithea/templates/email_templates/pull_request_comment.html:6
 #, python-format
 msgid "%s commented on pull request \"%s\""
 msgstr "%s skomentował nowe połączenie gałęzi \"%s\""
 #: kallithea/templates/email_templates/pull_request_comment.html:10
 msgid "Pull request was closed with status"
 msgstr "Wniosek połączenia został zamknięty ze statusem"
 #: kallithea/templates/email_templates/pull_request_comment.html:12
 msgid "Pull request changed status"
 msgstr "Wniosek połączenia zmienił status"
 #: kallithea/templates/email_templates/registration.html:6
 msgid "View this user here"
 msgstr "Zobacz tego użytkownika tutaj"
 #: kallithea/templates/errors/error_document.html:47
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr "Zostaniesz przekierowany do %s za %s sekund"
 #: kallithea/templates/files/diff_2way.html:15
 #, python-format
 msgid "%s File side-by-side diff"
 msgstr "Pliki z listą zmian i różnic: %s"
 #: kallithea/templates/files/diff_2way.html:22
 #: kallithea/templates/files/file_diff.html:11
 msgid "File diff"
 msgstr "Pliki różnic"
 #: kallithea/templates/files/diff_2way.html:58
-msgid "ignore white space"
+msgid "ignore whitespace"
 msgstr "ignoruj spacje"
 #: kallithea/templates/files/diff_2way.html:59
 msgid "turn on edit mode"
 msgstr "włączyć tryb edycji"
 #: kallithea/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File Diff"
 msgstr "%s Pliki różnic"
 #: kallithea/templates/files/files.html:4
 #: kallithea/templates/files/files.html:84
 #, python-format
 msgid "%s Files"
 msgstr "Pliki %s"
 #: kallithea/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr "Pliki %s"
 #: kallithea/templates/files/files_add.html:25
 msgid "Add new file"
 msgstr "Dodaj nowy plik"
 #: kallithea/templates/files/files_add.html:45
 #: kallithea/templates/files/files_edit.html:43
 #: kallithea/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr "Położenie"
 #: kallithea/templates/files/files_add.html:47
 msgid "Enter filename..."
 msgstr ""
 #: kallithea/templates/files/files_add.html:49
 #: kallithea/templates/files/files_add.html:53
 msgid "or"
 msgstr "lub"
 #: kallithea/templates/files/files_add.html:49
 msgid "Upload File"
 msgstr ""
 #: kallithea/templates/files/files_add.html:53
 msgid "Create New File"
 msgstr ""
 #: kallithea/templates/files/files_add.html:58
 msgid "New file mode"
 msgstr "Nowy tryb pliku"
 #: kallithea/templates/files/files_add.html:69
 #: kallithea/templates/files/files_delete.html:57
 #: kallithea/templates/files/files_edit.html:72
 msgid "Commit changes"
 msgstr "Zatwierdź zmiany"
 #: kallithea/templates/files/files_browser.html:13
 msgid "revision"
 msgstr "rewizja"
 #: kallithea/templates/files/files_browser.html:14
 msgid "Previous revision"
 msgstr "poprzednia wersja"
 #: kallithea/templates/files/files_browser.html:16
 msgid "Next revision"
 msgstr "następna wersja"
 #: kallithea/templates/files/files_browser.html:22
 msgid "Follow current branch"
 msgstr "Obserwuj aktualną gałąź"
 #: kallithea/templates/files/files_browser.html:25
 msgid "Search File List"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:29
 msgid "Loading file list..."
 msgstr "Wczytywanie listy plików..."
 #: kallithea/templates/files/files_browser.html:42
 msgid "Size"
 msgstr "Rozmiar"
 #: kallithea/templates/files/files_browser.html:43
 msgid "Mimetype"
 msgstr "Typ MIME"
 #: kallithea/templates/files/files_browser.html:44
 msgid "Last Revision"
 msgstr "Rewizja"
 #: kallithea/templates/files/files_browser.html:45

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

➞

Show inline comments

 # Portuguese (Brazil) translations for Kallithea.
 # Copyright (C) 2014 RhodeCode GmbH, and others.
 # This file is distributed under the same license as the Kallithea project.
 # Translators:
 # Augusto Herrmann <augusto.herrmann@gmail.com>, 2012
 # gnustavo <gustavo@gnustavo.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version:  Kallithea\n"
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 "POT-Creation-Date: 2014-07-02 19:08-0400\n"
 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 "Language-Team: Portuguese (Brazil) "
 "(http://www.transifex.com/projects/p/Kallithea/language/pt_BR/)\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 #: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90
 #: kallithea/controllers/pullrequests.py:265
 msgid "There are no changesets yet"
 msgstr "Não há nenhum changeset ainda"
 #: kallithea/controllers/changelog.py:186
 msgid "All Branches"
 msgstr "Todos os Ramos"
 #: kallithea/controllers/changelog.py:189
 msgid "(closed)"
 msgstr "(fechado)"
 #: kallithea/controllers/changeset.py:87
-msgid "Show white space"
+msgid "Show whitespace"
 msgstr "Mostrar espaços em branco"
 #: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
-msgid "Ignore white space"
+msgid "Ignore whitespace"
 msgstr "Ignorar espaços em branco"
 #: kallithea/controllers/changeset.py:167
 #, python-format
 msgid "increase diff context to %(num)s lines"
 msgstr ""
 #: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98
 #: kallithea/controllers/files.py:121
 msgid "Such revision does not exist for this repository"
 msgstr ""
 #: kallithea/controllers/changeset.py:355
 #: kallithea/controllers/pullrequests.py:482
 #, python-format
 msgid "Status change -> %s"
 msgstr "Mudança de estado -> %s"
 #: kallithea/controllers/changeset.py:386
 msgid ""
 "Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr "Mudar o estado de um changeset associado a um pull request não é permitido"
 #: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65
 msgid "Select changeset"
 msgstr ""
 #: kallithea/controllers/error.py:72
 msgid "Home page"
 msgstr "Página inicial"
 #: kallithea/controllers/error.py:101
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr ""
 "A requisição não pôde ser compreendida pelo servidor devido à sintaxe mal"
 " formada."
 #: kallithea/controllers/error.py:104
 msgid "Unauthorized access to resource"
 msgstr "Acesso não autorizado ao recurso"
 #: kallithea/controllers/error.py:106
 msgid "You don't have permission to view this page"
 msgstr "Você não tem permissão para ver esta página"
 #: kallithea/controllers/error.py:108
 msgid "The resource could not be found"
 msgstr "O recurso não pôde ser encontrado"
 #: kallithea/controllers/error.py:110
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr ""
 "O servidor encontrou uma condição inesperada que o impediu de satisfazer "
 "a requisição."
 #: kallithea/controllers/feed.py:55
 #, python-format
 msgid "Changes on %s repository"
 msgstr "Modificações no repositório %s"
 #: kallithea/controllers/feed.py:56
 #, python-format
 msgid "%s %s feed"
 msgstr "%s - feed %s"
 #: kallithea/controllers/feed.py:89
 #: kallithea/templates/changeset/changeset.html:139
 #: kallithea/templates/changeset/changeset.html:151
 #: kallithea/templates/compare/compare_diff.html:75
 #: kallithea/templates/compare/compare_diff.html:85
 #: kallithea/templates/pullrequests/pullrequest_show.html:178
 #: kallithea/templates/pullrequests/pullrequest_show.html:202
 msgid "Changeset was too big and was cut off..."
 msgstr "Conjunto de mudanças era grande demais e foi cortado..."
 #: kallithea/controllers/feed.py:93
 #, python-format
 msgid "%s committed on %s"
 msgstr "%s commitados em %s"
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr "Clique aqui para adicionar um novo arquivo"
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
 msgid "This repository is has been locked by %s on %s"
@@ @@ -4981,193 +4981,193 @@ msgstr "" @@
 msgid "No changesets yet"
 msgstr "Nenhum conjunto de alterações ainda."
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "Assinar o feed rss de %s"
 #: kallithea/templates/data_table/_dt_elements.html:111
 #: kallithea/templates/data_table/_dt_elements.html:113
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "Assinar o feed atom de %s"
 #: kallithea/templates/data_table/_dt_elements.html:141
 msgid "Creating"
 msgstr ""
 #: kallithea/templates/email_templates/changeset_comment.html:6
 #, python-format
 msgid "%s commented on a %s changeset."
 msgstr "%s comentou num changeset de %s."
 #: kallithea/templates/email_templates/changeset_comment.html:9
 msgid "The changeset status was changed to"
 msgstr "O estado do changeset foi alterado para"
 #: kallithea/templates/email_templates/main.html:8
 msgid "This is a notification from Kallithea."
 msgstr "Esta é uma notificação do Kallithea."
 #: kallithea/templates/email_templates/password_reset.html:4
 #, python-format
 msgid "Hello %s"
 msgstr "Olá %s"
 #: kallithea/templates/email_templates/password_reset.html:5
 msgid "We received a request to create a new password for your account."
 msgstr "Recebemos uma requisição para criar uma nova senha para sua conta."
 #: kallithea/templates/email_templates/password_reset.html:6
 msgid "You can generate it by clicking following URL"
 msgstr "Você pode gerá-la clicando na seguinte URL"
 #: kallithea/templates/email_templates/password_reset.html:10
 msgid "Please ignore this email if you did not request a new password ."
 msgstr "Por favor, ignore este email se você não requisitou uma nova senha."
 #: kallithea/templates/email_templates/pull_request.html:6
 #, python-format
 msgid ""
 "%s opened a pull request for repository %s and wants you to review "
 "changes."
 msgstr "%s abriu um pull request para o repositório %s e espera sua revisão."
 #: kallithea/templates/email_templates/pull_request.html:8
 #: kallithea/templates/pullrequests/pullrequest.html:31
 #: kallithea/templates/pullrequests/pullrequest_data.html:14
 #: kallithea/templates/pullrequests/pullrequest_show.html:28
 msgid "Title"
 msgstr "Título"
 #: kallithea/templates/email_templates/pull_request_comment.html:6
 #, python-format
 msgid "%s commented on pull request \"%s\""
 msgstr "%s comentou no pull request \"%s\""
 #: kallithea/templates/email_templates/pull_request_comment.html:10
 msgid "Pull request was closed with status"
 msgstr "O pull request foi fechado com o estado"
 #: kallithea/templates/email_templates/pull_request_comment.html:12
 msgid "Pull request changed status"
 msgstr "O pull request mudou de estado"
 #: kallithea/templates/email_templates/registration.html:6
 msgid "View this user here"
 msgstr "Veja este usuário aqui"
 #: kallithea/templates/errors/error_document.html:47
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr "Você será redirecionado para %s em %s segundos"
 #: kallithea/templates/files/diff_2way.html:15
 #, python-format
 msgid "%s File side-by-side diff"
 msgstr "Arquivo %s diff lado-a-lado"
 #: kallithea/templates/files/diff_2way.html:22
 #: kallithea/templates/files/file_diff.html:11
 msgid "File diff"
 msgstr "Diff do arquivo"
 #: kallithea/templates/files/diff_2way.html:58
-msgid "ignore white space"
+msgid "ignore whitespace"
 msgstr "ignorar espaços em branco"
 #: kallithea/templates/files/diff_2way.html:59
 msgid "turn on edit mode"
 msgstr "habilitar modo de edição"
 #: kallithea/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File Diff"
 msgstr "%s Diff de Arquivo"
 #: kallithea/templates/files/files.html:4
 #: kallithea/templates/files/files.html:84
 #, python-format
 msgid "%s Files"
 msgstr "%s Arquivos"
 #: kallithea/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr "%s Adicionar Arquivos"
 #: kallithea/templates/files/files_add.html:25
 msgid "Add new file"
 msgstr "Adicionar novo arquivo"
 #: kallithea/templates/files/files_add.html:45
 #: kallithea/templates/files/files_edit.html:43
 #: kallithea/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr "Local"
 #: kallithea/templates/files/files_add.html:47
 msgid "Enter filename..."
 msgstr ""
 #: kallithea/templates/files/files_add.html:49
 #: kallithea/templates/files/files_add.html:53
 msgid "or"
 msgstr "ou"
 #: kallithea/templates/files/files_add.html:49
 msgid "Upload File"
 msgstr ""
 #: kallithea/templates/files/files_add.html:53
 msgid "Create New File"
 msgstr ""
 #: kallithea/templates/files/files_add.html:58
 msgid "New file mode"
 msgstr ""
 #: kallithea/templates/files/files_add.html:69
 #: kallithea/templates/files/files_delete.html:57
 #: kallithea/templates/files/files_edit.html:72
 msgid "Commit changes"
 msgstr "Realizar commit das alterações"
 #: kallithea/templates/files/files_browser.html:13
 msgid "revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:14
 msgid "Previous revision"
 msgstr "Revisão anterior"
 #: kallithea/templates/files/files_browser.html:16
 msgid "Next revision"
 msgstr "Próxima revisão"
 #: kallithea/templates/files/files_browser.html:22
 msgid "Follow current branch"
 msgstr "Seguir o ramo atual"
 #: kallithea/templates/files/files_browser.html:25
 msgid "Search File List"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:29
 msgid "Loading file list..."
 msgstr "Carregando lista de arquivos..."
 #: kallithea/templates/files/files_browser.html:42
 msgid "Size"
 msgstr "Tamanho"
 #: kallithea/templates/files/files_browser.html:43
 msgid "Mimetype"
 msgstr "Mimetype"
 #: kallithea/templates/files/files_browser.html:44
 msgid "Last Revision"
 msgstr "Última revisão"
 #: kallithea/templates/files/files_browser.html:45

kallithea/i18n/ru/LC_MESSAGES/kallithea.po

➞

Show inline comments

 # Russian translations for Kallithea.
 # Copyright (C) 2014 RhodeCode GmbH, and others.
 # This file is distributed under the same license as the Kallithea project.
 # Translators:
 # ArcheR <aleclitvinov1980@gmail.com>, 2013
 # mokeev1995 <mokeev_andre@mail.ru>, 2013
 # Andrey Mivrenik <myvrenik@gmail.com>, 2013
 # invision70 <invision70@gmail.com>, 2014
 # ivlevdenis <ivlevdenis.ru@gmail.com>, 2013
 # Mikhail Zholobov <legal90@gmail.com>, 2013
 # Ruslan Bekenev <furyinbox@gmail.com>, 2013
 # SkryabinD <skryabind@gmail.com>, 2014
 # softforwinxp <softforwinxp@gmail.com>, 2013
 # zhmylove <zhmylove@narod.ru>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version:  Kallithea\n"
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 "POT-Creation-Date: 2014-07-02 19:08-0400\n"
 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 "Language-Team: Russian "
 "(http://www.transifex.com/projects/p/Kallithea/language/ru/)\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 #: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90
 #: kallithea/controllers/pullrequests.py:265
 msgid "There are no changesets yet"
 msgstr "Ещё не было изменений"
 #: kallithea/controllers/changelog.py:186
 msgid "All Branches"
 msgstr "Все ветки"
 #: kallithea/controllers/changelog.py:189
 msgid "(closed)"
 msgstr "(закрыто)"
 #: kallithea/controllers/changeset.py:87
-msgid "Show white space"
+msgid "Show whitespace"
 msgstr "Отображать пробелы"
 #: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
-msgid "Ignore white space"
+msgid "Ignore whitespace"
 msgstr "Игнорировать пробелы"
 #: kallithea/controllers/changeset.py:167
 #, python-format
 msgid "increase diff context to %(num)s lines"
 msgstr ""
 #: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98
 #: kallithea/controllers/files.py:121
 msgid "Such revision does not exist for this repository"
 msgstr ""
 #: kallithea/controllers/changeset.py:355
 #: kallithea/controllers/pullrequests.py:482
 #, python-format
 msgid "Status change -> %s"
 msgstr "Изменение статуса -> %s"
 #: kallithea/controllers/changeset.py:386
 msgid ""
 "Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr ""
 "Нельзя редактировать статус изменений, связанных  с закрытыми pull-"
 "request'ами."
 #: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65
 msgid "Select changeset"
 msgstr "Выбрать набор изменений"
 #: kallithea/controllers/error.py:72
 msgid "Home page"
 msgstr "Домашняя страница"
 #: kallithea/controllers/error.py:101
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr "Запрос не распознан сервером из-за неправильного синтаксиса."
 #: kallithea/controllers/error.py:104
 msgid "Unauthorized access to resource"
 msgstr "Несанкционированный доступ к ресурсу"
 #: kallithea/controllers/error.py:106
 msgid "You don't have permission to view this page"
 msgstr "У вас нет прав для просмотра этой страницы"
 #: kallithea/controllers/error.py:108
 msgid "The resource could not be found"
 msgstr "Ресурс не найден"
 #: kallithea/controllers/error.py:110
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr "Сервер не может выполнить запрос, из-за неправильного условия в запросе"
 #: kallithea/controllers/feed.py:55
 #, python-format
 msgid "Changes on %s repository"
 msgstr "Изменения в репозитарии %s"
 #: kallithea/controllers/feed.py:56
 #, python-format
 msgid "%s %s feed"
 msgstr "Лента новостей %s %s"
 #: kallithea/controllers/feed.py:89
 #: kallithea/templates/changeset/changeset.html:139
 #: kallithea/templates/changeset/changeset.html:151
 #: kallithea/templates/compare/compare_diff.html:75
 #: kallithea/templates/compare/compare_diff.html:85
 #: kallithea/templates/pullrequests/pullrequest_show.html:178
 #: kallithea/templates/pullrequests/pullrequest_show.html:202
 msgid "Changeset was too big and was cut off..."
 msgstr "Изменения оказались слишком большими и были вырезаны..."
 #: kallithea/controllers/feed.py:93
 #, python-format
 msgid "%s committed on %s"
 msgstr "%s выполнил commit в %s"
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr "Нажмите чтобы добавить новый файл"
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr "Репозиторий заблокировал %s в %s"
@@ @@ -5009,193 +5009,193 @@ msgstr "Изменений ещё не было" @@
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "Подписаться на ленту RSS %s"
 #: kallithea/templates/data_table/_dt_elements.html:111
 #: kallithea/templates/data_table/_dt_elements.html:113
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "Подписаться на ленту Atom %s"
 #: kallithea/templates/data_table/_dt_elements.html:141
 msgid "Creating"
 msgstr ""
 #: kallithea/templates/email_templates/changeset_comment.html:6
 #, python-format
 msgid "%s commented on a %s changeset."
 msgstr "прокомментирован %s в наборе изменений %s."
 #: kallithea/templates/email_templates/changeset_comment.html:9
 msgid "The changeset status was changed to"
 msgstr "Состояние набора изменений изменено на"
 #: kallithea/templates/email_templates/main.html:8
 msgid "This is a notification from Kallithea."
 msgstr "Это уведомление от Kallithea"
 #: kallithea/templates/email_templates/password_reset.html:4
 #, python-format
 msgid "Hello %s"
 msgstr "Здравствуйте, %s"
 #: kallithea/templates/email_templates/password_reset.html:5
 msgid "We received a request to create a new password for your account."
 msgstr "Мы отправили запрос на создание нового пароля для вашего аккаунта."
 #: kallithea/templates/email_templates/password_reset.html:6
 msgid "You can generate it by clicking following URL"
 msgstr "Вы можете заново сгенерировать его, перейдя по следующей ссылке"
 #: kallithea/templates/email_templates/password_reset.html:10
 msgid "Please ignore this email if you did not request a new password ."
 msgstr ""
 "Пожалуйста, проигнорируйте данное сообщение, если вы не запрашивали новый"
 " пароль."
 #: kallithea/templates/email_templates/pull_request.html:6
 #, python-format
 msgid ""
 "%s opened a pull request for repository %s and wants you to review "
 "changes."
 msgstr ""
 "%s открыл pull-request для репозитория %s и просит вас просмотреть "
 "изменения"
 #: kallithea/templates/email_templates/pull_request.html:8
 #: kallithea/templates/pullrequests/pullrequest.html:31
 #: kallithea/templates/pullrequests/pullrequest_data.html:14
 #: kallithea/templates/pullrequests/pullrequest_show.html:28
 msgid "Title"
 msgstr "Заголовок"
 #: kallithea/templates/email_templates/pull_request_comment.html:6
 #, python-format
 msgid "%s commented on pull request \"%s\""
 msgstr "%s оставил комментарий к pull-request'у \"%s\""
 #: kallithea/templates/email_templates/pull_request_comment.html:10
 msgid "Pull request was closed with status"
 msgstr "Pull-request был закрыт со статусом"
 #: kallithea/templates/email_templates/pull_request_comment.html:12
 msgid "Pull request changed status"
 msgstr "Статус pull-request'а был изменен"
 #: kallithea/templates/email_templates/registration.html:6
 msgid "View this user here"
 msgstr "Подробнее о пользователе"
 #: kallithea/templates/errors/error_document.html:47
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr "Вы будете посланы на %s через %s секунд"
 #: kallithea/templates/files/diff_2way.html:15
 #, python-format
 msgid "%s File side-by-side diff"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:22
 #: kallithea/templates/files/file_diff.html:11
 msgid "File diff"
 msgstr "Сравнение файлов "
 #: kallithea/templates/files/diff_2way.html:58
-msgid "ignore white space"
+msgid "ignore whitespace"
 msgstr "игнорировать пробелы"
 #: kallithea/templates/files/diff_2way.html:59
 msgid "turn on edit mode"
 msgstr "включить режим редактирования"
 #: kallithea/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File Diff"
 msgstr "Сравнение файла %s"
 #: kallithea/templates/files/files.html:4
 #: kallithea/templates/files/files.html:84
 #, python-format
 msgid "%s Files"
 msgstr "%s Файлы"
 #: kallithea/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr "%s Файлов добавлено"
 #: kallithea/templates/files/files_add.html:25
 msgid "Add new file"
 msgstr "Добавить файл"
 #: kallithea/templates/files/files_add.html:45
 #: kallithea/templates/files/files_edit.html:43
 #: kallithea/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr "Расположение"
 #: kallithea/templates/files/files_add.html:47
 msgid "Enter filename..."
 msgstr ""
 #: kallithea/templates/files/files_add.html:49
 #: kallithea/templates/files/files_add.html:53
 msgid "or"
 msgstr "или"
 #: kallithea/templates/files/files_add.html:49
 msgid "Upload File"
 msgstr ""
 #: kallithea/templates/files/files_add.html:53
 msgid "Create New File"
 msgstr ""
 #: kallithea/templates/files/files_add.html:58
 msgid "New file mode"
 msgstr "Режим нового файла"
 #: kallithea/templates/files/files_add.html:69
 #: kallithea/templates/files/files_delete.html:57
 #: kallithea/templates/files/files_edit.html:72
 msgid "Commit changes"
 msgstr "Применить изменения"
 #: kallithea/templates/files/files_browser.html:13
 msgid "revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:14
 msgid "Previous revision"
 msgstr "Предыдущая ревизия"
 #: kallithea/templates/files/files_browser.html:16
 msgid "Next revision"
 msgstr "Следующая ревизия"
 #: kallithea/templates/files/files_browser.html:22
 msgid "Follow current branch"
 msgstr "Отслеживать данную ветку"
 #: kallithea/templates/files/files_browser.html:25
 msgid "Search File List"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:29
 msgid "Loading file list..."
 msgstr "Загружается список файлов..."
 #: kallithea/templates/files/files_browser.html:42
 msgid "Size"
 msgstr "Размер"
 #: kallithea/templates/files/files_browser.html:43
 msgid "Mimetype"
 msgstr "Тип файла"
 #: kallithea/templates/files/files_browser.html:44
 msgid "Last Revision"
 msgstr "Последняя версия"
 #: kallithea/templates/files/files_browser.html:45

kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po

➞

Show inline comments

 # Chinese (China) translations for Kallithea.
 # Copyright (C) 2014 RhodeCode GmbH, and others.
 # This file is distributed under the same license as the Kallithea project.
 # Translators:
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 # mikespook <mikespook@gmail.com>, 2012
 # xpol <xpolife@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version:  Kallithea\n"
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 "POT-Creation-Date: 2014-07-02 19:08-0400\n"
 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 "Language-Team: Chinese (China) "
 "(http://www.transifex.com/projects/p/Kallithea/language/zh_CN/)\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 #: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90
 #: kallithea/controllers/pullrequests.py:265
 msgid "There are no changesets yet"
 msgstr "还没有修订集"
 #: kallithea/controllers/changelog.py:186
 msgid "All Branches"
 msgstr "所有分支"
 #: kallithea/controllers/changelog.py:189
 msgid "(closed)"
 msgstr ""
 #: kallithea/controllers/changeset.py:87
-msgid "Show white space"
+msgid "Show whitespace"
 msgstr ""
 #: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
-msgid "Ignore white space"
+msgid "Ignore whitespace"
 msgstr ""
 #: kallithea/controllers/changeset.py:167
 #, python-format
 msgid "increase diff context to %(num)s lines"
 msgstr ""
 #: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98
 #: kallithea/controllers/files.py:121
 msgid "Such revision does not exist for this repository"
 msgstr ""
 #: kallithea/controllers/changeset.py:355
 #: kallithea/controllers/pullrequests.py:482
 #, python-format
 msgid "Status change -> %s"
 msgstr "状态修改为%s"
 #: kallithea/controllers/changeset.py:386
 msgid ""
 "Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr ""
 #: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65
 msgid "Select changeset"
 msgstr ""
 #: kallithea/controllers/error.py:72
 msgid "Home page"
 msgstr "主页"
 #: kallithea/controllers/error.py:101
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr "由于错误的语法，服务器无法对请求进行响应。"
 #: kallithea/controllers/error.py:104
 msgid "Unauthorized access to resource"
 msgstr "未授权的资源访问"
 #: kallithea/controllers/error.py:106
 msgid "You don't have permission to view this page"
 msgstr "无权访问该页面"
 #: kallithea/controllers/error.py:108
 msgid "The resource could not be found"
 msgstr "资源未找到"
 #: kallithea/controllers/error.py:110
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr "服务进入非预期的混乱状态，这会阻止它对请求进行响应。"
 #: kallithea/controllers/feed.py:55
 #, python-format
 msgid "Changes on %s repository"
 msgstr "%s库的修改"
 #: kallithea/controllers/feed.py:56
 #, python-format
 msgid "%s %s feed"
 msgstr "%s %s订阅"
 #: kallithea/controllers/feed.py:89
 #: kallithea/templates/changeset/changeset.html:139
 #: kallithea/templates/changeset/changeset.html:151
 #: kallithea/templates/compare/compare_diff.html:75
 #: kallithea/templates/compare/compare_diff.html:85
 #: kallithea/templates/pullrequests/pullrequest_show.html:178
 #: kallithea/templates/pullrequests/pullrequest_show.html:202
 msgid "Changeset was too big and was cut off..."
 msgstr "修订集太大已被截断......"
 #: kallithea/controllers/feed.py:93
 #, python-format
 msgid "%s committed on %s"
 msgstr ""
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr ""
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr "版本库由%s于%s锁定"
 #: kallithea/controllers/files.py:313
 msgid "You can only delete files with revision being a valid branch "
@@ @@ -4898,193 +4898,193 @@ msgstr "" @@
 msgid "No changesets yet"
 msgstr "无修订"
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "订阅%s的RSS"
 #: kallithea/templates/data_table/_dt_elements.html:111
 #: kallithea/templates/data_table/_dt_elements.html:113
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "订阅%s的Atom"
 #: kallithea/templates/data_table/_dt_elements.html:141
 msgid "Creating"
 msgstr ""
 #: kallithea/templates/email_templates/changeset_comment.html:6
 #, python-format
 msgid "%s commented on a %s changeset."
 msgstr ""
 #: kallithea/templates/email_templates/changeset_comment.html:9
 msgid "The changeset status was changed to"
 msgstr ""
 #: kallithea/templates/email_templates/main.html:8
 msgid "This is a notification from Kallithea."
 msgstr "这是一个Kallithea通知。"
 #: kallithea/templates/email_templates/password_reset.html:4
 #, python-format
 msgid "Hello %s"
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:5
 msgid "We received a request to create a new password for your account."
 msgstr "我们收到重置你用户密码的请求。"
 #: kallithea/templates/email_templates/password_reset.html:6
 msgid "You can generate it by clicking following URL"
 msgstr "点击下面的链接以重新生成密码："
 #: kallithea/templates/email_templates/password_reset.html:10
 msgid "Please ignore this email if you did not request a new password ."
 msgstr ""
 #: kallithea/templates/email_templates/pull_request.html:6
 #, python-format
 msgid ""
 "%s opened a pull request for repository %s and wants you to review "
 "changes."
 msgstr ""
 #: kallithea/templates/email_templates/pull_request.html:8
 #: kallithea/templates/pullrequests/pullrequest.html:31
 #: kallithea/templates/pullrequests/pullrequest_data.html:14
 #: kallithea/templates/pullrequests/pullrequest_show.html:28
 msgid "Title"
 msgstr "标题"
 #: kallithea/templates/email_templates/pull_request_comment.html:6
 #, python-format
 msgid "%s commented on pull request \"%s\""
 msgstr ""
 #: kallithea/templates/email_templates/pull_request_comment.html:10
 msgid "Pull request was closed with status"
 msgstr ""
 #: kallithea/templates/email_templates/pull_request_comment.html:12
 msgid "Pull request changed status"
 msgstr ""
 #: kallithea/templates/email_templates/registration.html:6
 msgid "View this user here"
 msgstr "查看用户"
 #: kallithea/templates/errors/error_document.html:47
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr "重定向到%s，于%s秒后"
 #: kallithea/templates/files/diff_2way.html:15
 #, python-format
 msgid "%s File side-by-side diff"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:22
 #: kallithea/templates/files/file_diff.html:11
 msgid "File diff"
 msgstr "文件差异"
 #: kallithea/templates/files/diff_2way.html:58
-msgid "ignore white space"
+msgid "ignore whitespace"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:59
 msgid "turn on edit mode"
 msgstr ""
 #: kallithea/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File Diff"
 msgstr ""
 #: kallithea/templates/files/files.html:4
 #: kallithea/templates/files/files.html:84
 #, python-format
 msgid "%s Files"
 msgstr ""
 #: kallithea/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr ""
 #: kallithea/templates/files/files_add.html:25
 msgid "Add new file"
 msgstr "新建文件"
 #: kallithea/templates/files/files_add.html:45
 #: kallithea/templates/files/files_edit.html:43
 #: kallithea/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr "位置"
 #: kallithea/templates/files/files_add.html:47
 msgid "Enter filename..."
 msgstr ""
 #: kallithea/templates/files/files_add.html:49
 #: kallithea/templates/files/files_add.html:53
 msgid "or"
 msgstr "或者"
 #: kallithea/templates/files/files_add.html:49
 msgid "Upload File"
 msgstr ""
 #: kallithea/templates/files/files_add.html:53
 msgid "Create New File"
 msgstr ""
 #: kallithea/templates/files/files_add.html:58
 msgid "New file mode"
 msgstr ""
 #: kallithea/templates/files/files_add.html:69
 #: kallithea/templates/files/files_delete.html:57
 #: kallithea/templates/files/files_edit.html:72
 msgid "Commit changes"
 msgstr "提交修改"
 #: kallithea/templates/files/files_browser.html:13
 msgid "revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:14
 msgid "Previous revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:16
 msgid "Next revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:22
 msgid "Follow current branch"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:25
 msgid "Search File List"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:29
 msgid "Loading file list..."
 msgstr "加载文件列表..."
 #: kallithea/templates/files/files_browser.html:42
 msgid "Size"
 msgstr "大小"
 #: kallithea/templates/files/files_browser.html:43
 msgid "Mimetype"
 msgstr "MIME类型"
 #: kallithea/templates/files/files_browser.html:44
 msgid "Last Revision"
 msgstr "最后修订号"
 #: kallithea/templates/files/files_browser.html:45

kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po

➞

Show inline comments

 # Chinese (Taiwan) translations for Kallithea.
 # Copyright (C) 2014 RhodeCode GmbH, and others.
 # This file is distributed under the same license as the Kallithea project.
 # Translators:
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version:  Kallithea\n"
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 "POT-Creation-Date: 2014-07-02 19:08-0400\n"
 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 "Language-Team: Chinese (Taiwan) "
 "(http://www.transifex.com/projects/p/Kallithea/language/zh_TW/)\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 #: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90
 #: kallithea/controllers/pullrequests.py:265
 msgid "There are no changesets yet"
 msgstr ""
 #: kallithea/controllers/changelog.py:186
 msgid "All Branches"
 msgstr ""
 #: kallithea/controllers/changelog.py:189
 msgid "(closed)"
 msgstr ""
 #: kallithea/controllers/changeset.py:87
-msgid "Show white space"
+msgid "Show whitespace"
 msgstr ""
 #: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
-msgid "Ignore white space"
+msgid "Ignore whitespace"
 msgstr ""
 #: kallithea/controllers/changeset.py:167
 #, python-format
 msgid "increase diff context to %(num)s lines"
 msgstr ""
 #: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98
 #: kallithea/controllers/files.py:121
 msgid "Such revision does not exist for this repository"
 msgstr ""
 #: kallithea/controllers/changeset.py:355
 #: kallithea/controllers/pullrequests.py:482
 #, python-format
 msgid "Status change -> %s"
 msgstr ""
 #: kallithea/controllers/changeset.py:386
 msgid ""
 "Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr ""
 #: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65
 msgid "Select changeset"
 msgstr ""
 #: kallithea/controllers/error.py:72
 msgid "Home page"
 msgstr "首頁"
 #: kallithea/controllers/error.py:101
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr ""
 #: kallithea/controllers/error.py:104
 msgid "Unauthorized access to resource"
 msgstr ""
 #: kallithea/controllers/error.py:106
 msgid "You don't have permission to view this page"
 msgstr "您沒有權限瀏覽這個頁面"
 #: kallithea/controllers/error.py:108
 msgid "The resource could not be found"
 msgstr "找不到這個資源"
 #: kallithea/controllers/error.py:110
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr ""
 #: kallithea/controllers/feed.py:55
 #, python-format
 msgid "Changes on %s repository"
 msgstr "修改於版本庫 %s"
 #: kallithea/controllers/feed.py:56
 #, python-format
 msgid "%s %s feed"
 msgstr ""
 #: kallithea/controllers/feed.py:89
 #: kallithea/templates/changeset/changeset.html:139
 #: kallithea/templates/changeset/changeset.html:151
 #: kallithea/templates/compare/compare_diff.html:75
 #: kallithea/templates/compare/compare_diff.html:85
 #: kallithea/templates/pullrequests/pullrequest_show.html:178
 #: kallithea/templates/pullrequests/pullrequest_show.html:202
 msgid "Changeset was too big and was cut off..."
 msgstr ""
 #: kallithea/controllers/feed.py:93
 #, python-format
 msgid "%s committed on %s"
 msgstr ""
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr ""
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr ""
 #: kallithea/controllers/files.py:313
 msgid "You can only delete files with revision being a valid branch "
@@ @@ -4896,193 +4896,193 @@ msgstr "" @@
 msgid "No changesets yet"
 msgstr "尚未有任何變更"
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "訂閱 %s rss"
 #: kallithea/templates/data_table/_dt_elements.html:111
 #: kallithea/templates/data_table/_dt_elements.html:113
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "訂閱 %s atom"
 #: kallithea/templates/data_table/_dt_elements.html:141
 msgid "Creating"
 msgstr ""
 #: kallithea/templates/email_templates/changeset_comment.html:6
 #, python-format
 msgid "%s commented on a %s changeset."
 msgstr ""
 #: kallithea/templates/email_templates/changeset_comment.html:9
 msgid "The changeset status was changed to"
 msgstr ""
 #: kallithea/templates/email_templates/main.html:8
 msgid "This is a notification from Kallithea."
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:4
 #, python-format
 msgid "Hello %s"
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:5
 msgid "We received a request to create a new password for your account."
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:6
 msgid "You can generate it by clicking following URL"
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:10
 msgid "Please ignore this email if you did not request a new password ."
 msgstr ""
 #: kallithea/templates/email_templates/pull_request.html:6
 #, python-format
 msgid ""
 "%s opened a pull request for repository %s and wants you to review "
 "changes."
 msgstr ""
 #: kallithea/templates/email_templates/pull_request.html:8
 #: kallithea/templates/pullrequests/pullrequest.html:31
 #: kallithea/templates/pullrequests/pullrequest_data.html:14
 #: kallithea/templates/pullrequests/pullrequest_show.html:28
 msgid "Title"
 msgstr ""
 #: kallithea/templates/email_templates/pull_request_comment.html:6
 #, python-format
 msgid "%s commented on pull request \"%s\""
 msgstr ""
 #: kallithea/templates/email_templates/pull_request_comment.html:10
 msgid "Pull request was closed with status"
 msgstr ""
 #: kallithea/templates/email_templates/pull_request_comment.html:12
 msgid "Pull request changed status"
 msgstr ""
 #: kallithea/templates/email_templates/registration.html:6
 msgid "View this user here"
 msgstr ""
 #: kallithea/templates/errors/error_document.html:47
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:15
 #, python-format
 msgid "%s File side-by-side diff"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:22
 #: kallithea/templates/files/file_diff.html:11
 msgid "File diff"
 msgstr "檔案差異"
 #: kallithea/templates/files/diff_2way.html:58
-msgid "ignore white space"
+msgid "ignore whitespace"
 msgstr ""
 #: kallithea/templates/files/diff_2way.html:59
 msgid "turn on edit mode"
 msgstr ""
 #: kallithea/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File Diff"
 msgstr ""
 #: kallithea/templates/files/files.html:4
 #: kallithea/templates/files/files.html:84
 #, python-format
 msgid "%s Files"
 msgstr ""
 #: kallithea/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr ""
 #: kallithea/templates/files/files_add.html:25
 msgid "Add new file"
 msgstr ""
 #: kallithea/templates/files/files_add.html:45
 #: kallithea/templates/files/files_edit.html:43
 #: kallithea/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr "位置"
 #: kallithea/templates/files/files_add.html:47
 msgid "Enter filename..."
 msgstr ""
 #: kallithea/templates/files/files_add.html:49
 #: kallithea/templates/files/files_add.html:53
 msgid "or"
 msgstr ""
 #: kallithea/templates/files/files_add.html:49
 msgid "Upload File"
 msgstr ""
 #: kallithea/templates/files/files_add.html:53
 msgid "Create New File"
 msgstr ""
 #: kallithea/templates/files/files_add.html:58
 msgid "New file mode"
 msgstr ""
 #: kallithea/templates/files/files_add.html:69
 #: kallithea/templates/files/files_delete.html:57
 #: kallithea/templates/files/files_edit.html:72
 msgid "Commit changes"
 msgstr "遞交修改"
 #: kallithea/templates/files/files_browser.html:13
 msgid "revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:14
 msgid "Previous revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:16
 msgid "Next revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:22
 msgid "Follow current branch"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:25
 msgid "Search File List"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:29
 msgid "Loading file list..."
 msgstr "載入檔案列表..."
 #: kallithea/templates/files/files_browser.html:42
 msgid "Size"
 msgstr "大小"
 #: kallithea/templates/files/files_browser.html:43
 msgid "Mimetype"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:44
 msgid "Last Revision"
 msgstr ""
 #: kallithea/templates/files/files_browser.html:45

kallithea/templates/files/diff_2way.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="js_extra()">
 <script type="text/javascript" src="${h.url('/js/codemirror.js')}"></script>
 <script type="text/javascript" src="${h.url('/js/mergely.js')}"></script>
 </%def>
 <%def name="css_extra()">
 <link rel="stylesheet" type="text/css" href="${h.url('/css/codemirror.css')}"/>
 <link rel="stylesheet" type="text/css" href="${h.url('/css/mergely.css')}"/>
 </%def>
 <%def name="title()">
     ${_('%s File side-by-side diff') % c.repo_name}
     %if c.site_name:
         &middot; ${c.site_name}
     %endif
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('File diff')} ${h.show_id(c.changeset_1)} &rarr; ${h.show_id(c.changeset_2)}
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
 ${self.repo_context_bar('changelog')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="diff-container" style="overflow-x: hidden">
         <div class="diffblock comm" style="margin:3px; padding:1px">
             <div class="code-header">
                 <div class="changeset_header">
                     <div class="changeset_file">
                         ${h.link_to(h.safe_unicode(c.node1.path),h.url('files_home',repo_name=c.repo_name,
                         revision=c.cs2.raw_id,f_path=h.safe_unicode(c.node1.path)))}
                     </div>
                     <div class="diff-actions">
                       <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full diff for this file'))}">
                           <img class="icon" src="${h.url('/images/icons/page_white_go.png')}"/>
                       </a>
                       <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full side-by-side diff for this file'))}">
                           <img class="icon" src="${h.url('/images/icons/application_double.png')}"/>
                       </a>
                       <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='raw')}" class="tooltip" title="${h.tooltip(_('Raw diff'))}">
                           <img class="icon" src="${h.url('/images/icons/page_white.png')}"/>
                       </a>
                       <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}">
                           <img class="icon" src="${h.url('/images/icons/page_save.png')}"/>
                       </a>
                       ${h.checkbox('ignorews', label=_('ignore white space'))}
                       ${h.checkbox('edit_mode', label=_('turn on edit mode'))}
                       ${h.checkbox('ignorews', label=_('Ignore whitespace'))}
                       ${h.checkbox('edit_mode', label=_('Edit'))}
                     </div>
                 </div>
             </div>
             <div id="compare"></div>
         </div>
     </div>
 <script>
 var orig1_url = '${h.url('files_raw_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),revision=c.cs1.raw_id)}';
 var orig2_url = '${h.url('files_raw_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node2.path),revision=c.cs2.raw_id)}';
 $(document).ready(function () {
     $('#compare').mergely({
         width: 'auto',
         height: '600',
         fgcolor: {a:'#ddffdd',c:'#cccccc',d:'#ffdddd'},
         bgcolor: '#fff',
         viewport: true,
         cmsettings: {mode: 'text/plain', readOnly: true, lineWrapping: false, lineNumbers: true},
         lhs: function(setValue) {
             if("${c.node1.is_binary}" == "True"){
                 setValue('Binary file')
+            }
             else{
                 $.ajax(orig1_url, {dataType: 'text', success: setValue});
+            }
         },
         rhs: function(setValue) {
             if("${c.node2.is_binary}" == "True"){
                 setValue('Binary file')
+            }
             else{
                 $.ajax(orig2_url, {dataType: 'text', success: setValue});
+            }
         },
     });
     $('#ignorews').change(function(e){
         var val = e.currentTarget.checked;
         $('#compare').mergely('options', {ignorews: val});
         $('#compare').mergely('update');
     })
     $('#edit_mode').change(function(e){
         var val = !e.currentTarget.checked;
         $('#compare').mergely('cm', 'lhs').setOption('readOnly', val);
         $('#compare').mergely('cm', 'rhs').setOption('readOnly', val);
         $('#compare').mergely('update');
     })
 });
 </script>
 </div>
 </%def>

0 comments (0 inline, 0 general)