* merged from glatzor

4 files changed, 6 insertions, 9 deletions

diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index 69a3e586..1744a0f2 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -200,9 +200,8 @@ class GtkInstallProgressAdapter(InstallProgress):
         logging.debug("got a conffile-prompt from dpkg for file: '%s'" % current)
         #self.expander.set_expanded(True)
         prim = _("Replace the customized configuration file\n'%s'?") % current
-        sec = _("You will loose all customizations, that have been made by "
-                "yourself or by a script, if you replace the file by its "
-                "latest version.")
+        sec = _("You will lose any local changes to this file "
+                "if you replace this file with the latest version.")
         markup = "<span weight=\"bold\" size=\"larger\">%s </span> \n\n%s" % (prim, sec)
         self.parent.label_conffile.set_markup(markup)
         self.parent.dialog_conffile.set_transient_for(self.parent.window_main)
diff --git a/UpdateManager/Common/DistInfo.py b/UpdateManager/Common/DistInfo.py
index 8153f04b..57621f52 100644
--- a/UpdateManager/Common/DistInfo.py
+++ b/UpdateManager/Common/DistInfo.py
@@ -26,7 +26,7 @@ from os import getenv
 import ConfigParser
 import string
 
-_ = gettext.gettext
+from gettext import gettext as _
 
 class Suite:
     def __init__(self):
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 04ad107c..1a4c7c40 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -208,12 +208,12 @@ class MyCache(apt.Cache):
         except urllib2.HTTPError:
             if lock.locked():
                 self.all_changes[name] = [_("The list of changes is not "
-                                            "available yet. Please try again "
+                                            "available yet.\nPlease try again "
                                             "later."), srcpkg]
         except IOError:
             if lock.locked():
                 self.all_changes[name] = [_("Failed to download the list "
-                                            "of changes. Please "
+                                            "of changes. \nPlease "
                                             "check your Internet "
                                             "connection."), srcpkg]
         if lock.locked():
@@ -601,7 +601,7 @@ class UpdateManager(SimpleGladeApp):
       self.refresh_updates_count()
       num_updates = self.cache.installCount
       if num_updates == 0:
-          text_header= "<big><b>%s</b></big>"  %_("Your system is up-to-date")
+          text_header= "<big><b>%s</b></big>"  % _("Your system is up-to-date")
           text_download = ""
           self.notebook_details.set_sensitive(False)
           self.treeview_update.set_sensitive(False)
diff --git a/update-manager b/update-manager
index 21b03702..f67ebd50 100644
--- a/update-manager
+++ b/update-manager
@@ -36,8 +36,6 @@ from gettext import gettext as _
 from optparse import OptionParser
 
 if __name__ == "__main__":
-  _ = gettext.gettext
-
   APP="update-manager"
   DIR="/usr/share/locale"