Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

hggtk: avoid "foo(s)", use "foos" instead

Using the real plural form makes messages grammatically correct for
values 0, 2, 3,... whereas I think the current form makes them look
odd for all values. This is very visible in messages like "Displaying
x of y revision(s)" where y is almost never equal to 1.

Changeset c2583e97e4ce…

Parent a2dd1d3959eb…

by Martin Geisler

Changes to 6 files · Browse files at c2583e97e4ce Showing diff from parent a2dd1d3959eb Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​hgemail.py Stacked
 
37
38
39
40
 
41
42
43
 
44
45
46
 
56
57
58
59
 
60
61
62
 
37
38
39
 
40
41
42
 
43
44
45
46
 
56
57
58
 
59
60
61
62
@@ -37,10 +37,10 @@
  tbuttons = [   self._toolbutton(gtk.STOCK_GOTO_LAST, _('Send'),   self._on_send_clicked, - _('Send email(s)')), + _('Send emails')),   self._toolbutton(gtk.STOCK_FIND, _('Test'),   self._on_test_clicked, - _('Show email(s) which would be sent')), + _('Show emails which would be sent')),   gtk.SeparatorToolItem(),   self._toolbutton(gtk.STOCK_PREFERENCES, _('Configure'),   self._on_conf_clicked, @@ -56,7 +56,7 @@
  if revargs[0] in ('--outgoing', '-o'):   self.set_title(_('Email outgoing changes'))   elif revargs[0] in ('--rev', '-r'): - self.set_title(_('Email revision(s) ') + ' '.join(revargs[1:])) + self.set_title(_('Email revisions ') + ' '.join(revargs[1:]))   else:   self.set_title(_('Email Mercurial Patches'))   self.set_default_size(650, 450)
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​hgtk.py Stacked
 
669
670
671
672
 
673
674
675
 
669
670
671
 
672
673
674
675
@@ -669,7 +669,7 @@
  _('hgtk serve [OPTION]...')),   "thgstatus": (thgstatus,   [('', 'delay', None, _('wait until the second ticks over')), - ('n', 'notify', [], _('notify the shell for path(s) given')), + ('n', 'notify', [], _('notify the shell for paths given')),   ('', 'remove', None, _('remove the status cache')),   ('s', 'show', None, _('show the contents of the'   ' status cache (no update)')),
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
1149
1150
1151
1152
 
1153
1154
1155
 
1149
1150
1151
 
1152
1153
1154
1155
@@ -1149,7 +1149,7 @@
    def strip_rev(self, menuitem):   rev = self.currevid - res = gdialog.Confirm(_('Confirm Strip Revision(s)'), [], self, + res = gdialog.Confirm(_('Confirm Strip Revisions'), [], self,   _('Remove revision %d and all descendants?') % rev).run()   if res != gtk.RESPONSE_YES:   return
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​logview/​treeview.py Stacked
 
261
262
263
264
 
265
266
267
 
261
262
263
 
264
265
266
267
@@ -261,7 +261,7 @@
  self.set_revision_id(revid)   if self.pbar is not None:   self.pbar.end() - revision_text = _('Displaying %(count)d of %(total)d revision(s)') % { + revision_text = _('Displaying %(count)d of %(total)d revisions') % {   'count': len(self.model),   'total': len(self.repo) }   self.pbar.set_status_text(revision_text)
Change 1 of 3 Show Entire File tortoisehg/​hgtk/​status.py Stacked
 
172
173
174
175
 
176
177
178
 
1268
1269
1270
1271
 
1272
1273
1274
 
1285
1286
1287
1288
 
1289
1290
1291
 
172
173
174
 
175
176
177
178
 
1268
1269
1270
 
1271
1272
1273
1274
 
1285
1286
1287
 
1288
1289
1290
1291
@@ -172,7 +172,7 @@
  tip=_('Remove or delete checked files')),   self.make_toolbutton(gtk.STOCK_CLEAR, _('_Forget'),   self.forget_clicked, - tip=_('Forget checked file(s) on next commit')), + tip=_('Forget checked files on next commit')),   gtk.SeparatorToolItem(),   self.make_toolbutton(gtk.STOCK_REFRESH, _('Re_fresh'),   self.refresh_clicked, @@ -1268,7 +1268,7 @@
  if self.is_merge():   res = gdialog.CustomPrompt(   _('Uncommited merge - please select a parent revision'), - _('Revert file(s) to local or other parent?'), + _('Revert files to local or other parent?'),   self, (_('&Local'), _('&Other'), _('&Cancel')), 2).run()   if res == 0:   revertopts['rev'] = self.repo[None].p1().rev() @@ -1285,7 +1285,7 @@
  else:   revertopts['rev'] = str(self.repo['.'].rev())   response = gdialog.CustomPrompt(_('Confirm Revert'), - _('Revert file(s) to revision %s?\n\n%s') % (revertopts['rev'], + _('Revert files to revision %s?\n\n%s') % (revertopts['rev'],   filelist(files)), self, (_('&Yes (backup changes)'),   _('Yes (&discard changes)'),   _('&Cancel')), 2, 2).run()
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​visdiff.py Stacked
 
155
156
157
158
 
159
160
161
 
155
156
157
 
158
159
160
161
@@ -155,7 +155,7 @@
  node1 = repo[node2].parents()[0].node()   else:   if revs: - title = _('revision(s) ') + ' to '.join(revs) + title = _('revisions ') + ' to '.join(revs)   else:   title = _('working changes')   node1, node2 = cmdutil.revpair(repo, revs)