[vino] fix Bug 586455 – Remove markup from translatable strings

[Jonh Wendell <jwendell src gnome org>]

commit 138e7ed1a0745e09b3c968a1474361f3a69a68d4
Author: Claude Paroz <claude 2xlibre net>
Date:   Sat Jun 20 08:56:00 2009 -0300

    fix Bug 586455 â?? Remove markup from translatable strings

 capplet/vino-preferences.ui |   26 +++++++++++++++++---------
 server/vino-prompt.ui       |    8 ++++++--
 2 files changed, 23 insertions(+), 11 deletions(-)
---
diff --git a/capplet/vino-preferences.ui b/capplet/vino-preferences.ui
index 3533c27..c9f4ca1 100644
--- a/capplet/vino-preferences.ui
+++ b/capplet/vino-preferences.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.16 -->
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="vino_dialog">
     <property name="border_width">5</property>
@@ -27,8 +27,10 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Sharing&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Sharing</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="position">0</property>
@@ -63,8 +65,10 @@
                     <child>
                       <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;i&gt;Some of these preferences are locked down&lt;/i&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Some of these preferences are locked down</property>
+                        <attributes>
+                          <attribute name="style" value="italic"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -188,8 +192,10 @@
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Security&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Security</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="position">0</property>
@@ -292,8 +298,10 @@
                   <object class="GtkLabel" id="label12">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Notification Area&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Notification Area</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="position">0</property>
diff --git a/server/vino-prompt.ui b/server/vino-prompt.ui
index ca8becc..8cc3091 100644
--- a/server/vino-prompt.ui
+++ b/server/vino-prompt.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
+  <requires lib="gtk+" version="2.16"/>
   <object class="GtkDialog" id="vino_dialog">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Question</property>
@@ -30,8 +31,11 @@
                   <object class="GtkLabel" id="warning_label">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Another user is trying to view your desktop.&lt;/b&gt;&lt;/big&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Another user is trying to view your desktop.</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                      <attribute name="scale" value="1.2"/>
+                    </attributes>
                     <property name="wrap">True</property>
                   </object>
                   <packing>