[jhbuild: 33/60] [terminal, gui] share action labels to minimize translation work

[Frederic Peters <fpeters src gnome org>]

commit 09cdd73bd7ffb56d54075641b8c0898515c04cd6
Author: Frédéric Péters <fpeters 0d be>
Date:   Mon May 18 14:01:03 2009 +0200

    [terminal,gui] share action labels to minimize translation work
---
 jhbuild/frontends/gtkui.py    |    2 +-
 jhbuild/frontends/terminal.py |   14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jhbuild/frontends/gtkui.py b/jhbuild/frontends/gtkui.py
index 192c297..e7580a4 100644
--- a/jhbuild/frontends/gtkui.py
+++ b/jhbuild/frontends/gtkui.py
@@ -296,7 +296,7 @@ class AppWindow(gtk.Window, buildscript.BuildScript):
         pass
 
     def handle_error(self, module, state, nextstate, error, altstates):
-        summary = _('error during stage %(stage)s of %(module)s') % {
+        summary = _('Error during stage %(stage)s of %(module)s') % {
             'stage':state, 'module':module.name}
         try:
             error_message = error.args[0]
diff --git a/jhbuild/frontends/terminal.py b/jhbuild/frontends/terminal.py
index 8267ab3..582305a 100644
--- a/jhbuild/frontends/terminal.py
+++ b/jhbuild/frontends/terminal.py
@@ -251,7 +251,7 @@ class TerminalBuildScript(buildscript.BuildScript):
 
     def handle_error(self, module, state, nextstate, error, altstates):
         '''handle error during build'''
-        summary = _('error during stage %(stage)s of %(module)s') % {
+        summary = _('Error during stage %(stage)s of %(module)s') % {
             'stage':state, 'module':module.name}
         try:
             error_message = error.args[0]
@@ -279,14 +279,14 @@ class TerminalBuildScript(buildscript.BuildScript):
             return 'fail'
         while True:
             print
-            uprint(_('  [1] rerun stage %s') % state)
-            uprint(_('  [2] ignore error and continue to %s') % nextstate)
-            uprint(_('  [3] give up on module'))
-            uprint(_('  [4] start shell'))
-            uprint(_('  [5] reload configuration'))
+            uprint('  [1] %s' % _('Rerun stage %s') % state)
+            uprint('  [2] %s' % _('Ignore error and continue to %s') % nextstate)
+            uprint('  [3] %s' % _('Give up on module'))
+            uprint('  [4] %s' % _('Start shell'))
+            uprint('  [5] %s' % _('Reload configuration'))
             nb_options = i = 6
             for altstate in altstates:
-                uprint(_('  [%d] go to stage %s') % (i, altstate))
+                uprint('  [%d] %s' % (i, _('Go to stage %s') % altstate))
                 i = i + 1
             val = raw_input(uencode(_('choice: ')))
             val = val.strip()