Merge lp:~nataliabidart/ubuntuone-control-panel/translations into lp:ubuntuone-control-panel

[Natalia Bidart]

- Added proper domain setting to the GTK UI (LP: #735957).

[Martin Albisetti (beuno)]

17 +# import the GUi after the translation domain has been set

(dumb change)
s/GUi/GUI

review: Approve

[lp:~nataliabidart/ubuntuone-control-panel/translations]

110. By Natalia Bidart on 2011-03-22

Typo.

[Eric Casteleijn (thisfred)]

Looks good!

review: Approve

=== modified file 'bin/ubuntuone-control-panel-gtk'
--- bin/ubuntuone-control-panel-gtk	2011-03-17 14:57:38 +0000
+++ bin/ubuntuone-control-panel-gtk	2011-03-22 21:30:58 +0000
@@ -23,13 +23,17 @@
 import sys
 
 import dbus.mainloop.glib
+import gettext
 
 from optparse import OptionParser
 
+from ubuntuone.controlpanel.gtk import DBUS_BUS_NAME, TRANSLATION_DOMAIN
+
+dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+gettext.textdomain(TRANSLATION_DOMAIN)
+
+# import the GUI after the translation domain has been set
 from ubuntuone.controlpanel.gtk.gui import ControlPanelWindow
-from ubuntuone.controlpanel.gtk import DBUS_BUS_NAME
-
-dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
 
 def parser_options():

=== modified file 'ubuntuone/controlpanel/gtk/__init__.py'
--- ubuntuone/controlpanel/gtk/__init__.py	2011-03-17 14:27:06 +0000
+++ ubuntuone/controlpanel/gtk/__init__.py	2011-03-22 21:30:58 +0000
@@ -19,3 +19,4 @@
 """The GTK graphical interface for the control panel for Ubuntu One."""
 
 DBUS_BUS_NAME = "com.ubuntuone.controlpanel.gui"
+TRANSLATION_DOMAIN = "ubuntuone-control-panel"

=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-03-21 21:18:11 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-03-22 21:30:58 +0000
@@ -52,7 +52,7 @@
 from ubuntuone.controlpanel.logger import setup_logging, log_call
 from ubuntuone.controlpanel.utils import get_data_file
 
-from ubuntuone.controlpanel.gtk import package_manager
+from ubuntuone.controlpanel.gtk import package_manager, TRANSLATION_DOMAIN
 
 logger = setup_logging('gtk.gui')
 _ = gettext.gettext
@@ -119,6 +119,7 @@
 
         if filename is not None:
             builder = gtk.Builder()
+            builder.set_translation_domain(TRANSLATION_DOMAIN)
             builder.add_from_file(get_data_file(filename))
             builder.connect_signals(self)