Mercurial > kallithea
changeset 4401:4df61d1bd2d5
spelling: let's call it 'whitespace' without space or hyphen
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 01 Aug 2014 20:28:42 +0200 |
parents | 184159c21be2 |
children | 10190008738e |
files | 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 |
diffstat | 12 files changed, 35 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/changeset.py Fri Aug 01 20:28:42 2014 +0200 +++ b/kallithea/controllers/changeset.py Fri Aug 01 20:28:42 2014 +0200 @@ -86,21 +86,21 @@ 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
--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po Fri Aug 01 20:28:42 2014 +0200 +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po Fri Aug 01 20:28:42 2014 +0200 @@ -32,11 +32,11 @@ 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 @@ -5033,7 +5033,7 @@ msgstr "" #: kallithea/templates/files/diff_2way.html:58 -msgid "ignore white space" +msgid "ignore whitespace" msgstr "" #: kallithea/templates/files/diff_2way.html:59
--- a/kallithea/i18n/en/LC_MESSAGES/kallithea.po Fri Aug 01 20:28:42 2014 +0200 +++ b/kallithea/i18n/en/LC_MESSAGES/kallithea.po Fri Aug 01 20:28:42 2014 +0200 @@ -31,11 +31,11 @@ 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 @@ -5016,7 +5016,7 @@ msgstr "" #: kallithea/templates/files/diff_2way.html:58 -msgid "ignore white space" +msgid "ignore whitespace" msgstr "" #: kallithea/templates/files/diff_2way.html:59
--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Fri Aug 01 20:28:42 2014 +0200 +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Fri Aug 01 20:28:42 2014 +0200 @@ -32,11 +32,11 @@ 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 @@ -5049,7 +5049,7 @@ 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
--- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Fri Aug 01 20:28:42 2014 +0200 +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Fri Aug 01 20:28:42 2014 +0200 @@ -37,11 +37,11 @@ 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 @@ -5030,7 +5030,7 @@ msgstr "ファイル差分" #: kallithea/templates/files/diff_2way.html:58 -msgid "ignore white space" +msgid "ignore whitespace" msgstr "空白を無視" #: kallithea/templates/files/diff_2way.html:59
--- a/kallithea/i18n/kallithea.pot Fri Aug 01 20:28:42 2014 +0200 +++ b/kallithea/i18n/kallithea.pot Fri Aug 01 20:28:42 2014 +0200 @@ -30,11 +30,11 @@ 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 @@ -4894,7 +4894,7 @@ msgstr "" #: kallithea/templates/files/diff_2way.html:58 -msgid "ignore white space" +msgid "ignore whitespace" msgstr "" #: kallithea/templates/files/diff_2way.html:59
--- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Fri Aug 01 20:28:42 2014 +0200 +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Fri Aug 01 20:28:42 2014 +0200 @@ -37,11 +37,11 @@ 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 @@ -5089,7 +5089,7 @@ 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
--- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Fri Aug 01 20:28:42 2014 +0200 +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Fri Aug 01 20:28:42 2014 +0200 @@ -33,11 +33,11 @@ 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 @@ -5074,7 +5074,7 @@ 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
--- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Fri Aug 01 20:28:42 2014 +0200 +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Fri Aug 01 20:28:42 2014 +0200 @@ -42,11 +42,11 @@ 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 @@ -5102,7 +5102,7 @@ msgstr "Сравнение файлов " #: kallithea/templates/files/diff_2way.html:58 -msgid "ignore white space" +msgid "ignore whitespace" msgstr "игнорировать пробелы" #: kallithea/templates/files/diff_2way.html:59
--- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Fri Aug 01 20:28:42 2014 +0200 +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Fri Aug 01 20:28:42 2014 +0200 @@ -34,11 +34,11 @@ 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 @@ -4991,7 +4991,7 @@ msgstr "文件差异" #: kallithea/templates/files/diff_2way.html:58 -msgid "ignore white space" +msgid "ignore whitespace" msgstr "" #: kallithea/templates/files/diff_2way.html:59
--- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Fri Aug 01 20:28:42 2014 +0200 +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Fri Aug 01 20:28:42 2014 +0200 @@ -32,11 +32,11 @@ 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 @@ -4989,7 +4989,7 @@ msgstr "檔案差異" #: kallithea/templates/files/diff_2way.html:58 -msgid "ignore white space" +msgid "ignore whitespace" msgstr "" #: kallithea/templates/files/diff_2way.html:59
--- a/kallithea/templates/files/diff_2way.html Fri Aug 01 20:28:42 2014 +0200 +++ b/kallithea/templates/files/diff_2way.html Fri Aug 01 20:28:42 2014 +0200 @@ -55,8 +55,8 @@ <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>