[jhbuild/jhdebuild: 158/158] Merge branch 'master' into jhdebuild

[John Carr <johncarr src gnome org>]

commit 9ee838ef67142382710cbf3a55055e1ad2722c6d
Merge: 120e5f1... e098dbb...
Author: John Carr <john carr unrouted co uk>
Date:   Sat Jun 20 21:08:57 2009 +0100

    Merge branch 'master' into jhdebuild
    
    Conflicts:
    	jhbuild/config.py
    	jhbuild/frontends/terminal.py

 Makefile.am                                  |    2 +-
 Makefile.plain                               |   39 +-
 NEWS                                         |  100 ++
 buildbot/Makefile                            |   19 -
 buildbot/Makefile.am                         |   52 ++
 configure.ac                                 |    4 +-
 doc/C/jhbuild.xml                            |   17 +-
 doc/es/es.po                                 |  891 ++++++++++---------
 doc/fr/fr.po                                 | 1256 +++++++++++---------------
 jhbuild/commands/Makefile.am                 |    4 +-
 jhbuild/commands/base.py                     |   88 +--
 jhbuild/commands/bot.py                      |   15 +-
 jhbuild/commands/checkbranches.py            |    2 +-
 jhbuild/commands/gui.py                      |   27 +-
 jhbuild/commands/sanitycheck.py              |    3 +
 jhbuild/commands/tinderbox.py                |   17 +-
 jhbuild/commands/uninstall.py                |   23 +-
 jhbuild/config.py                            |  141 +++-
 jhbuild/defaults.jhbuildrc                   |   29 +-
 jhbuild/frontends/Makefile.am                |    2 +-
 jhbuild/frontends/__init__.py                |    2 +-
 jhbuild/frontends/autobuild.py               |    2 +-
 jhbuild/frontends/buildscript.py             |   43 +-
 jhbuild/frontends/gtkui.py                   | 1053 ++++++++++++++--------
 jhbuild/frontends/jhbuild.glade              |  534 -----------
 jhbuild/frontends/terminal.py                |   20 +-
 jhbuild/modtypes/__init__.py                 |    7 +-
 jhbuild/modtypes/perl.py                     |    2 +-
 jhbuild/modtypes/tarball.py                  |    4 +-
 jhbuild/moduleset.py                         |    4 +-
 jhbuild/monkeypatch.py                       |    5 +
 jhbuild/utils/cmds.py                        |   10 +-
 jhbuild/utils/httpcache.py                   |    4 +
 jhbuild/utils/packagedb.py                   |    2 +-
 jhbuild/utils/subprocess_win32.py            |  136 +++
 jhbuild/utils/trayicon.py                    |    4 +-
 jhbuild/versioncontrol/__init__.py           |    4 +
 jhbuild/versioncontrol/git.py                |  139 ++-
 jhbuild/versioncontrol/tarball.py            |   16 +-
 modulesets/bootstrap.modules                 |   64 +-
 modulesets/freedesktop-2.26.modules          |   13 -
 modulesets/freedesktop-2.28.modules          |   15 +-
 modulesets/freedesktop-devel.modules         |   18 -
 modulesets/gnome-2.16.modules                |    2 +-
 modulesets/gnome-2.18.modules                |    2 +-
 modulesets/gnome-2.26.modules                |    8 +-
 modulesets/gnome-2.28.modules                |   66 ++-
 modulesets/gnome-devel.modules               |   30 +-
 modulesets/gnome-external-deps-2.22.modules  |    2 +-
 modulesets/gnome-external-deps-2.24.modules  |    4 +-
 modulesets/gnome-external-deps-2.26.modules  |   29 +-
 modulesets/gnome-external-deps-2.28.modules  |   83 +-
 modulesets/gnome-external-deps-devel.modules |   37 +-
 modulesets/gnome-suites-2.20.modules         |    2 +-
 modulesets/gnome-suites-2.22.modules         |    2 +-
 modulesets/gnome-suites-2.24.modules         |    2 +-
 modulesets/gnome-suites-2.26.modules         |   28 +-
 modulesets/gnome-suites-2.28.modules         |   52 +-
 modulesets/gnome-suites-devel.modules        |   15 +-
 patches/guile-1.8.5-libtool2.patch           |   55 ++
 po/POTFILES.in                               |    3 +-
 po/es.po                                     |  734 ++++++++-------
 po/fr.po                                     |  788 ++++++++++-------
 po/sv.po                                     |  984 +++++++++++---------
 scripts/Makefile.am                          |    1 +
 scripts/jhbuild.in                           |    5 +-
 tests/tests.py                               |   24 +-
 67 files changed, 4099 insertions(+), 3691 deletions(-)
---
diff --cc jhbuild/config.py
index 41a14fb,f8bc495..a1b8ba0
--- a/jhbuild/config.py
+++ b/jhbuild/config.py
@@@ -40,8 -45,7 +45,8 @@@ _known_keys = [ 'moduleset', 'modules'
                  'alwaysautogen', 'nobuild', 'makeclean', 'makecheck', 'module_makecheck',
                  'use_lib64', 'tinderbox_outputdir', 'sticky_date',
                  'tarballdir', 'pretty_print', 'svn_program', 'makedist',
 +                'nodinstall', 'debian_checkout_modules', 'build_external_deps',
-                 'makedistcheck', 'nonotify', 'cvs_program',
+                 'makedistcheck', 'nonotify', 'notrayicon', 'cvs_program',
                  'checkout_mode', 'copy_dir', 'module_checkout_mode',
                  'build_policy', 'trycheckout', 'min_time',
                  'nopoison', 'forcecheck', 'makecheck_advisory',
diff --cc jhbuild/frontends/terminal.py
index 46a4d62,77a11b8..2945c2b
--- a/jhbuild/frontends/terminal.py
+++ b/jhbuild/frontends/terminal.py
@@@ -281,19 -278,18 +281,19 @@@ class TerminalBuildScript(buildscript.B
              return 'fail'
          while True:
              print
-             uprint(_('  [1] rerun phase %s') % phase)
+             uprint('  [1] %s' % _('Rerun phase %s') % phase)
              if nextphase:
-                 uprint(_('  [2] ignore error and continue to %s') % nextphase)
+                 uprint('  [2] %s' % _('Ignore error and continue to %s') % nextphase)
              else:
-                 uprint(_('  [2] ignore error and continue to next module'))
-             uprint(_('  [3] give up on module'))
-             uprint(_('  [4] give up on module but fake success'))
-             uprint(_('  [5] start shell'))
-             uprint(_('  [6] reload configuration'))
 -                uprint('  [2] %s' % _('Ignore error and continue to next module'))
 -            uprint('  [3] %s' % _('Give up on module'))
 -            uprint('  [4] %s' % _('Start shell'))
 -            uprint('  [5] %s' % _('Reload configuration'))
 -            nb_options = i = 6
 -            for altphase in altphases:
 -                uprint('  [%d] %s' % (i, _('Go to phase %s') % altphase))
 -                i += 1
++                uprint(_('  [2] Ignore error and continue to next module'))
++            uprint(_('  [3] Give up on module'))
++            uprint(_('  [4] Give up on module but fake success'))
++            uprint(_('  [5] Start shell'))
++            uprint(_('  [6] Reload configuration'))
 +            nb_options = i = 7
 +            for altphase in (altphases or []):
-                 uprint(_('  [%d] go to phase %s') % (i, altphase))
++                uprint(_('  [%d] Go to phase %s') % (i, altphase))
 +                i = i + 1
              val = raw_input(uencode(_('choice: ')))
              val = val.strip()
              if val == '1':