[jhbuild] l10n: various changes to help translators

[Frederic Peters <fpeters src gnome org>]

commit 4c6aa379a87c05326b8b22aff842e0b4b4b25cd1
Author: FrÃdÃric PÃters <fpeters 0d be>
Date:   Sun Jul 8 21:03:35 2012 +0200

    l10n: various changes to help translators

 jhbuild/commands/base.py        |    8 +++-----
 jhbuild/commands/make.py        |    4 ++--
 jhbuild/commands/sanitycheck.py |    6 +++---
 3 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/jhbuild/commands/base.py b/jhbuild/commands/base.py
index 799bc96..dda0fff 100644
--- a/jhbuild/commands/base.py
+++ b/jhbuild/commands/base.py
@@ -317,8 +317,8 @@ class cmd_buildone(BuildCommand):
                 from jhbuild.modtypes.autotools import AutogenModule
                 module = AutogenModule(modname, default_repo.branch(modname))
                 module.config = config
-                logging.info(_('module "%s" does not exist, created automatically using repository "%s"') % \
-                                (modname, default_repo.name))
+                logging.info(_('module "%(modname)s" does not exist, created automatically using repository "%(reponame)s"') % \
+                             {'modname': modname, 'reponame': default_repo.name})
             module_list.append(module)
 
         if not module_list:
@@ -455,9 +455,7 @@ class cmd_list(Command):
         config.set_from_cmdline_options(options)
         module_set = jhbuild.moduleset.load(config)
         if options.startat and options.list_all_modules:
-            raise UsageError(_('Conflicting options specified '
-                               '(\'%s\' and \'%s\')') % \
-                               ('--start-at', '--all-modules'))
+            raise UsageError(_('Conflicting options specified (\'--start-at\' and \'--all-modules\')'))
 
         if options.list_all_modules:
             module_list = module_set.modules.values()
diff --git a/jhbuild/commands/make.py b/jhbuild/commands/make.py
index 968d024..d5ee54c 100644
--- a/jhbuild/commands/make.py
+++ b/jhbuild/commands/make.py
@@ -93,8 +93,8 @@ class cmd_make(Command):
             from jhbuild.modtypes.autotools import AutogenModule
             module = AutogenModule(modname, default_repo.branch(modname))
             module.config = config
-            logging.info(_('module "%s" does not exist, created automatically using repository "%s"') % \
-                             (modname, default_repo.name))
+            logging.info(_('module "%(modname)s" does not exist, created automatically using repository "%(reponame)s"') % \
+                         {'modname': modname, 'reponame': default_repo.name})
 
         build = jhbuild.frontends.get_buildscript(config, [module], module_set=module_set)
         return build.build()
diff --git a/jhbuild/commands/sanitycheck.py b/jhbuild/commands/sanitycheck.py
index a5ebacb..f4a5d11 100644
--- a/jhbuild/commands/sanitycheck.py
+++ b/jhbuild/commands/sanitycheck.py
@@ -89,8 +89,8 @@ class cmd_sanitycheck(Command):
                         not_in_path.append(macro)
 
             if len(not_in_path) > 0:
-                uprint(_("Please copy the lacking macros (%s) in one of the following paths: %s"
-                         % (', '.join(not_in_path), ', '.join(path))))
+                uprint(_("Please copy the lacking macros (%(macros)s) in one of the following paths: %(path)s") % \
+                       {'macros': ', '.join(not_in_path), 'path': ', '.join(path)})
 
         except CommandError, exc:
             uprint(str(exc))
@@ -125,7 +125,7 @@ class cmd_sanitycheck(Command):
 
         if not (inpath('curl', os.environ['PATH'].split(os.pathsep)) or
                 inpath('wget', os.environ['PATH'].split(os.pathsep))):
-            uprint(_('%s or %s not found') % ('curl', 'wget'))
+            uprint(_('curl or wget not found'))
 
         # check for git:
         if not inpath('git', os.environ['PATH'].split(os.pathsep)):