Use named parameters for translatable strings with multiple params.

This is a cleanup for the po files.  xgettext displays the following
messages for some Python files:

warning: 'msgid' format string with unnamed arguments cannot be properly localized:
         The translator cannot reorder the arguments.
         Please consider using a format string with named arguments,
         and a mapping instead of a tuple for the arguments.

This patch modifies the reported format strings to use named parameters
per the warning message.  We were already using these style format
strings in users.py and possibly other files.  Basically when there is
more than one parameter in the format string, we should use a hash table
with named parameters.

1 files changed, 8 insertions, 2 deletions

diff --git a/vnc.py b/vnc.py
index db119d096..0a6a04933 100644
--- a/vnc.py
+++ b/vnc.py
@@ -134,9 +134,15 @@ class VncServer:
 
         # figure out product info
         if self.name is not None:
-            self.desktop = _("%s %s installation on host %s") % (product.productName, product.productVersion, self.name)
+            self.desktop = _("%(productName)s %(productVersion)s installation "
+                             "on host %(name)s") \
+                           % {'productName': product.productName,
+                              'productVersion': product.productVersion,
+                              'name': self.name}
         else:
-            self.desktop = _("%s %s installation") % (product.productName, product.productVersion)
+            self.desktop = _("%(productName)s %(productVersion)s installation")\
+                           % {'productName': product.productName,
+                              'productVersion': product.productVersion}
 
     def setVNCParam(self, param, value):
         """Set a parameter in the Xvnc server.