Localize unnamed arguments with named arguments and mapping - invalid syntax 2

During install of an Ubuntu package;

  File "/usr/lib/python2.7/dist-packages/jarabe/controlpanel/cmd.py", line 102
    % ('key': key, 'module': module))
            ^
SyntaxError: invalid syntax

Regression introduced by e4e2d87.

Also removed double translation, and a message that will never be
translated.

Author: quozl

src/jarabe/controlpanel/cmd.py

@@ -28,7 +28,7 @@
                          ' option with the same name: %(key)s'
                          ' module: %(module)r')
 _no_option_error = _('sugar-control-panel: key=%s not an available option')
-_general_error = _('sugar-control-panel: %s')
+_general_error = 'sugar-control-panel: %s'
 
 
 def cmd_help():
@@ -98,10 +98,10 @@ def main():
                     if found == 1:
                         print method.__doc__
                     else:
-                        print _(_same_option_warning
-                                % ('key': key, 'module': module))
+                        print _same_option_warning % \
+                            {'key': key, 'module': module}
             if found == 0:
-                print _(_no_option_error % key)
+                print _no_option_error % key
         if option in ('-l'):
             for module in modules:
                 methods = dir(module)
@@ -121,12 +121,12 @@ def main():
                         try:
                             method()
                         except Exception as detail:
-                            print _(_general_error % detail)
+                            print _general_error % detail
                     else:
-                        print _(_same_option_warning %
-                                ('key': key, 'module': module))
+                        print _same_option_warning % \
+                            {'key': key, 'module': module}
             if found == 0:
-                print _(_no_option_error % key)
+                print _no_option_error % key
         if option in ('-s'):
             for module in modules:
                 method = getattr(module, 'set_' + key, None)
@@ -137,14 +137,14 @@ def main():
                         try:
                             note = method(*args)
                         except Exception as detail:
-                            print _(_general_error % detail)
+                            print _general_error % detail
                         if note == _RESTART:
                             note_restart()
                     else:
-                        print _(_same_option_warning %
-                                ('key': key, 'module': module))
+                        print _same_option_warning % \
+                            {'key': key, 'module': module}
             if found == 0:
-                print _(_no_option_error % key)
+                print _no_option_error % key
         if option in ('-c'):
             for module in modules:
                 method = getattr(module, 'clear_' + key, None)
@@ -155,11 +155,11 @@ def main():
                         try:
                             note = method(*args)
                         except Exception as detail:
-                            print _(_general_error % detail)
+                            print _general_error % detail
                         if note == _RESTART:
                             note_restart()
                     else:
-                        print _(_same_option_warning %
-                                ('key': key, 'module': module))
+                        print _same_option_warning % \
+                            {'key': key, 'module': module}
             if found == 0:
-                print _(_no_option_error % key)
+                print _no_option_error % key