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

@@ @@ -77,39 +77,39 @@ def get_ignore_ws(fid, GET): @@
     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')

kallithea/i18n/de/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -23,29 +23,29 @@ msgstr "" @@
 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 ""
@@ @@ -5024,25 +5024,25 @@ 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/i18n/en/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -22,29 +22,29 @@ msgstr "" @@
 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 ""
@@ @@ -5007,25 +5007,25 @@ 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/i18n/fr/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -23,29 +23,29 @@ msgstr "" @@
 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 ""
@@ @@ -5040,25 +5040,25 @@ 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/i18n/ja/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -28,29 +28,29 @@ msgstr "" @@
 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 "お探しのリビジョンはこのリポジトリにはありません"
@@ @@ -5021,25 +5021,25 @@ 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/i18n/kallithea.pot

➞

Show inline comments

@@ @@ -21,29 +21,29 @@ msgstr "" @@
 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 ""
@@ @@ -4885,25 +4885,25 @@ 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/i18n/pl/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -28,29 +28,29 @@ msgstr "" @@
 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 ""
@@ @@ -5080,25 +5080,25 @@ msgstr "Zostaniesz przekierowany do %s z @@
 #: 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/i18n/pt_BR/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -24,29 +24,29 @@ msgstr "" @@
 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/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/i18n/ru/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -33,29 +33,29 @@ msgstr "" @@
 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/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/i18n/zh_CN/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -25,29 +25,29 @@ msgstr "" @@
 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 ""
@@ @@ -4982,25 +4982,25 @@ 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/i18n/zh_TW/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -23,29 +23,29 @@ msgstr "" @@
 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 ""
@@ @@ -4980,25 +4980,25 @@ 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/diff_2way.html

➞

Show inline comments

@@ @@ -46,26 +46,26 @@ ${self.repo_context_bar('changelog')} @@
                       <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 () {

0 comments (0 inline, 0 general)