[meld] Remove markup from translatable messages (closes bgo#570878)

[Kai Willadsen <kaiw src gnome org>]

commit 3144d4b8d55a795e3cd2d79460cf475f270bc514
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu Oct 7 08:38:00 2010 +1000

    Remove markup from translatable messages (closes bgo#570878)

 data/ui/filediff.ui    |    9 ++++++---
 data/ui/preferences.ui |   20 ++++++++++++++++----
 2 files changed, 22 insertions(+), 7 deletions(-)
---
diff --git a/data/ui/filediff.ui b/data/ui/filediff.ui
index 9770410..a73ea61 100644
--- a/data/ui/filediff.ui
+++ b/data/ui/filediff.ui
@@ -308,10 +308,13 @@
                     <property name="visible">True</property>
                     <property name="xpad">12</property>
                     <property name="ypad">12</property>
-                    <property name="label" translatable="yes">&lt;span weight="bold" size="larger"&gt;Some files have been modified.
-Which ones would you like to save?&lt;/span&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Some files have been modified.
+Which ones would you like to save?</property>
                     <property name="wrap">True</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                      <attribute name="scale" value="1.2"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/data/ui/preferences.ui b/data/ui/preferences.ui
index 3389dcf..ce61ec5 100644
--- a/data/ui/preferences.ui
+++ b/data/ui/preferences.ui
@@ -38,8 +38,11 @@
                       <object class="GtkLabel" id="label32">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Font&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">Font</property>
                         <property name="use_markup">True</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -140,8 +143,11 @@
                       <object class="GtkLabel" id="label34">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Display&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">Display</property>
                         <property name="use_markup">True</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -316,8 +322,11 @@
                       <object class="GtkLabel" id="label69">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;External editor&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">External editor</property>
                         <property name="use_markup">True</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -557,8 +566,11 @@
                       <object class="GtkLabel" id="label52">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Loading&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">Loading</property>
                         <property name="use_markup">True</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="expand">False</property>