Changeset - 4df61d1bd2d5
[Not reviewed]
kallithea/controllers/changeset.py
Show inline comments
 
@@ -65,63 +65,63 @@ 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]
kallithea/i18n/de/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -11,53 +11,53 @@ msgstr ""
 
"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 ""
 

	
 
@@ -5012,49 +5012,49 @@ 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"
kallithea/i18n/en/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -10,53 +10,53 @@ msgstr ""
 
"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 ""
 

	
 
@@ -4995,49 +4995,49 @@ 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"
kallithea/i18n/fr/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -11,53 +11,53 @@ msgstr ""
 
"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 ""
 

	
 
@@ -5028,49 +5028,49 @@ 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"
kallithea/i18n/ja/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -16,53 +16,53 @@ msgstr ""
 
"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 "クローズしたプルリクエストに関連するチェンジセットのステータスを変更することは許可されていません"
 

	
 
@@ -5009,49 +5009,49 @@ 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"
kallithea/i18n/kallithea.pot
Show inline comments
 
@@ -9,53 +9,53 @@ msgstr ""
 
"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"
 
@@ -4873,49 +4873,49 @@ 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"
kallithea/i18n/pl/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -16,53 +16,53 @@ msgstr ""
 
"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 "
 
@@ -5068,49 +5068,49 @@ 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"
kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -12,53 +12,53 @@ msgstr ""
 
"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"
 

	
 
@@ -5053,49 +5053,49 @@ msgstr "O pull request foi fechado com o
 
#: 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"
kallithea/i18n/ru/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -21,53 +21,53 @@ msgstr ""
 
"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-"
 
@@ -5081,49 +5081,49 @@ 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"
kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -13,53 +13,53 @@ msgstr ""
 
"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 ""
 

	
 
@@ -4970,49 +4970,49 @@ 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"
kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -11,53 +11,53 @@ msgstr ""
 
"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 ""
 

	
 
@@ -4968,49 +4968,49 @@ 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"
kallithea/templates/files/diff_2way.html
Show inline comments
 
@@ -34,50 +34,50 @@ ${self.repo_context_bar('changelog')}
 
        ${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{
0 comments (0 inline, 0 general)