Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset 724aeabd4fb9…

Parents 1e11536f7ef0…

Parents 0e25b8220809…

by Steve Borho

Changes to 7 files · Browse files at 724aeabd4fb9 Showing diff from parent 1e11536f7ef0 0e25b8220809 Diff from another changeset...

Show Entire File tortoisehg/​hgqt/​filedata.py Stacked
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​filedialogs.py Stacked
 
416
417
418
419
 
 
420
421
422
423
 
 
424
425
426
 
416
417
418
 
419
420
421
422
423
 
424
425
426
427
428
@@ -416,11 +416,13 @@
  self.actionReload.triggered.connect(self.reload)   self.actionReload.setIcon(qtlib.geticon('view-refresh'))   - self.actionNextDiff = QAction(qtlib.geticon('go-down'), 'Next diff', self) + self.actionNextDiff = QAction(qtlib.geticon('go-down'), + _('Next diff'), self)   self.actionNextDiff.setShortcut('Alt+Down')   self.actionNextDiff.triggered.connect(self.nextDiff)   - self.actionPrevDiff = QAction(qtlib.geticon('go-up'), 'Previous diff', self) + self.actionPrevDiff = QAction(qtlib.geticon('go-up'), + _('Previous diff'), self)   self.actionPrevDiff.setShortcut('Alt+Up')   self.actionPrevDiff.triggered.connect(self.prevDiff)  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
 
149
150
151
152
 
153
154
155
156
 
157
158
159
 
149
150
151
 
152
153
154
155
 
156
157
158
159
@@ -149,11 +149,11 @@
    # Next/Prev diff (in full file mode)   self.actionNextDiff = QAction(qtlib.geticon('go-down'), - 'Next diff (alt+down)', self) + _('Next diff (alt+down)'), self)   self.actionNextDiff.setShortcut('Alt+Down')   self.actionNextDiff.triggered.connect(self.nextDiff)   self.actionPrevDiff = QAction(qtlib.geticon('go-up'), - 'Previous diff (alt+up)', self) + _('Previous diff (alt+up)'), self)   self.actionPrevDiff.setShortcut('Alt+Up')   self.actionPrevDiff.triggered.connect(self.prevDiff)   self.setMode(self.actionDiffMode)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​i18n.py Stacked
 
6
7
8
 
9
10
11
12
13
 
 
 
14
15
16
 
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
@@ -6,11 +6,15 @@
 # GNU General Public License version 2, incorporated herein by reference.    from tortoisehg.util.i18n import _ as _gettext +from tortoisehg.util.i18n import ngettext as _ngettext  from tortoisehg.util.i18n import agettext    def _(message, context=''):   return unicode(_gettext(message, context), 'utf-8')   +def ngettext(singular, plural, n): + return unicode(_ngettext(singular, plural, n), 'utf-8') +  class localgettext(object):   def _(self, message, context=''):   return agettext(message, context='')
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​purge.py Stacked
 
12
13
14
15
 
16
17
18
 
111
112
113
114
 
 
 
115
116
117
118
 
 
 
119
120
121
122
123
 
 
 
124
125
126
 
12
13
14
 
15
16
17
18
 
111
112
113
 
114
115
116
117
118
119
 
120
121
122
123
124
125
 
 
126
127
128
129
130
131
@@ -12,7 +12,7 @@
 from mercurial import cmdutil, hg, ui    from tortoisehg.util import hglib -from tortoisehg.hgqt.i18n import _ +from tortoisehg.hgqt.i18n import _, ngettext  from tortoisehg.hgqt import qtlib, cmdui    from PyQt4.QtCore import * @@ -111,16 +111,21 @@
  self.showMessage.emit(_('Ready to purge.'))   U, I, T = self.files   if U: - self.ucb.setText(_('Delete %d unknown files') % len(U)) + self.ucb.setText(ngettext( + 'Delete %d unknown file', + 'Delete %d unknown files', len(U)) % len(U))   self.ucb.setChecked(True)   self.ucb.setEnabled(True)   if I: - self.icb.setText(_('Delete %d ignored files') % len(I)) + self.icb.setText(ngettext( + 'Delete %d ignored file', + 'Delete %d ignored files', len(I)) % len(I))   self.icb.setChecked(True)   self.icb.setEnabled(True)   if T: - self.tcb.setText(_('Delete %d files in .hg/Trashcan') % - len(T)) + self.tcb.setText(ngettext( + 'Delete %d file in .hg/Trashcan', + 'Delete %d files in .hg/Trashcan', len(T)) % len(T))   self.tcb.setChecked(True)   self.tcb.setEnabled(True)  
Show Entire File tortoisehg/​hgqt/​qtlib.py Stacked
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​util/​i18n.py Stacked
 
60
61
62
 
 
 
63
64
65
 
60
61
62
63
64
65
66
67
68
@@ -60,6 +60,9 @@
  return tmsg   return t.gettext(message)   +def ngettext(singular, plural, n): + return t.ngettext(singular, plural, n) +  def agettext(message, context=''):   """Translate message and convert to local encoding   such as 'ascii' before being returned.