# HG changeset patch
# User Martin Geisler <m...@lazybytes.net>
# Date 1254430284 -7200
# Node ID c2583e97e4ceccabb3df0ae4a478a42cbf2384b3
# Parent a2dd1d3959eb1197eb91b47e5c7dbf50a48ede87
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.
diff --git a/tortoisehg/hgtk/hgemail.py b/tortoisehg/hgtk/hgemail.py
--- a/tortoisehg/hgtk/hgemail.py
+++ b/tortoisehg/hgtk/hgemail.py
@@ -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)
diff --git a/tortoisehg/hgtk/hgtk.py b/tortoisehg/hgtk/hgtk.py
--- a/tortoisehg/hgtk/hgtk.py
+++ b/tortoisehg/hgtk/hgtk.py
@@ -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)')),
diff --git a/tortoisehg/hgtk/history.py b/tortoisehg/hgtk/history.py
--- a/tortoisehg/hgtk/history.py
+++ b/tortoisehg/hgtk/history.py
@@ -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
diff --git a/tortoisehg/hgtk/logview/treeview.py
b/tortoisehg/hgtk/logview/treeview.py
--- a/tortoisehg/hgtk/logview/treeview.py
+++ b/tortoisehg/hgtk/logview/treeview.py
@@ -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)
diff --git a/tortoisehg/hgtk/status.py b/tortoisehg/hgtk/status.py
--- a/tortoisehg/hgtk/status.py
+++ b/tortoisehg/hgtk/status.py
@@ -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()
diff --git a/tortoisehg/hgtk/visdiff.py b/tortoisehg/hgtk/visdiff.py
--- a/tortoisehg/hgtk/visdiff.py
+++ b/tortoisehg/hgtk/visdiff.py
@@ -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)
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
