Merge lp:~mpt/software-properties/1377742-markup into lp:software-properties

[Matthew Paul Thomas]

Factors out Pango markup from translatable strings, to avoid problems like bug 1377742. Also switches to using <small> for alert secondary text, rather than <b><big> for primary text.

[Michael Vogt (mvo)]

Nice, thanks!

review: Approve

=== modified file 'softwareproperties/gtk/DialogAddSourcesList.py'
--- softwareproperties/gtk/DialogAddSourcesList.py	2014-09-11 09:06:49 +0000
+++ softwareproperties/gtk/DialogAddSourcesList.py	2015-06-09 11:30:26 +0000
@@ -104,7 +104,7 @@
         header = _("There are no sources to install software from")
         body = _("The file '%s' does not contain any valid "
                  "software sources." % self.file)
-        self.label.set_markup("<big><b>%s</b></big>\n\n%s" % (header, body))
+        self.label.set_markup("%s\n\n<small>%s</small>" % (header, body))
 
     def run(self):
         res = self.dialog.run()
 
=== modified file 'softwareproperties/kde/DialogAdd.py'
--- softwareproperties/kde/DialogAdd.py	2014-12-01 07:04:29 +0000
+++ softwareproperties/kde/DialogAdd.py	2015-06-09 11:30:26 +0000
@@ -52,12 +52,13 @@
     else:
         example = "deb http://ftp.debian.org sarge main"
     # L10N: the example is of the format: deb http://ftp.debian.org sarge main
-    head = _('<big><b>Enter the complete APT line of the repository that '
-             'you want to add as source</b></big>')
-    msg =  _("The APT line includes the type, location and components of a "
-            "repository, for example  '%s'.") % ("<i>%s</i>" % example)
+    primary = _('Enter the complete APT line of the repository that '
+             'you want to add.')
+    secondary = _("Include the type, location and components of the "
+                "repository. Example: %s") % example
+    text = "%s<br /><br /><small>%s</small>" % primary, secondary
     self.label_example_line.setWordWrap(True)
-    self.label_example_line.setText(head + '<p>' + msg)
+    self.label_example_line.setText(text)
 
     translate_widget(self)
 
 
=== modified file 'softwareproperties/kde/SoftwarePropertiesKDE.py'
--- softwareproperties/kde/SoftwarePropertiesKDE.py	2014-12-01 07:04:29 +0000
+++ softwareproperties/kde/SoftwarePropertiesKDE.py	2015-06-09 11:30:26 +0000
@@ -702,13 +702,9 @@
         messageBox.setIcon(QMessageBox.Information)
         reloadButton = messageBox.addButton(_("Reload"), QMessageBox.AcceptRole)
         messageBox.addButton(QMessageBox.Close)
-        text = _("<b><big>The information about available software is out-of-date</big></b>\n"
-               "\n"
-               "To install software and updates from newly added or changed sources, you "
-               "have to reload the information about available software.\n"
-               "\n"
-               "You need a working internet connection to continue.")
-        text = text.replace("\n", "<br />")
+        primary = _("Your local copy of the software catalog is out of date.")
+        secondary = _("A new copy will be downloaded.")
+        text = "%s<br /><br /><small>%s</small>" % primary, secondary
         messageBox.setText(text)
         messageBox.exec_()
         if (messageBox.clickedButton() == reloadButton):
@@ -732,7 +728,8 @@
       res = cdrom.add(progress)
     except SystemError as msg:
       title = _("CD Error")
-      text = _("<big><b>Error scanning the CD</b></big>\n\n%s")%msg
+      primary = _("Error scanning the CD")
+      text = "%s\n\n<small>%s</small>") % primary, msg
       #KMessageBox.sorry(self.userinterface, text, title)
       QMessageBox.warning(self.userinterface, title, text)
       return