From 4eb800f5fad1a749e8ff11d7b342ff66e1d8e3a2 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Tue, 17 Nov 2009 16:47:49 +0100
Subject: Remove markup from translatable strings in ui files

GTKBuilder format allows to separate markup from translatable content.
Whenever possible, this should be preferred so as there is less content to
translate and less error opportunities.
---
 widgets/e-timezone-dialog/e-timezone-dialog.ui | 12 ++++++++----
 widgets/misc/e-send-options.ui                 | 24 ++++++++++++++++--------
 2 files changed, 24 insertions(+), 12 deletions(-)

(limited to 'widgets')

diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.ui b/widgets/e-timezone-dialog/e-timezone-dialog.ui
index 7ce81a176c..a02ec00f1c 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.ui
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.ui
@@ -114,9 +114,8 @@ Use the right mouse button to zoom out.</property>
             <child>
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;Time Zones&lt;/b&gt;</property>
+                <property name="label" translatable="yes">Time Zones</property>
                 <property name="use_underline">False</property>
-                <property name="use_markup">True</property>
                 <property name="justify">GTK_JUSTIFY_LEFT</property>
                 <property name="wrap">False</property>
                 <property name="selectable">False</property>
@@ -124,6 +123,9 @@ Use the right mouse button to zoom out.</property>
                 <property name="yalign">0.5</property>
                 <property name="xpad">0</property>
                 <property name="ypad">0</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
               <packing>
                 <property name="padding">0</property>
@@ -216,9 +218,8 @@ Use the right mouse button to zoom out.</property>
             <child>
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;_Selection&lt;/b&gt;</property>
+                <property name="label" translatable="yes">_Selection</property>
                 <property name="use_underline">True</property>
-                <property name="use_markup">True</property>
                 <property name="justify">GTK_JUSTIFY_CENTER</property>
                 <property name="wrap">False</property>
                 <property name="selectable">False</property>
@@ -227,6 +228,9 @@ Use the right mouse button to zoom out.</property>
                 <property name="xpad">0</property>
                 <property name="ypad">0</property>
                 <property name="mnemonic_widget">timezone-combo</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
               <packing>
                 <property name="padding">0</property>
diff --git a/widgets/misc/e-send-options.ui b/widgets/misc/e-send-options.ui
index e43eb52eef..d02393b82f 100644
--- a/widgets/misc/e-send-options.ui
+++ b/widgets/misc/e-send-options.ui
@@ -270,8 +270,10 @@
                     <child type="label">
                       <object class="GtkLabel" id="label94">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Replies&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Replies</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
@@ -456,8 +458,10 @@
                     <child type="label">
                       <object class="GtkLabel" id="label103">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Delivery Options&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Delivery Options</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
@@ -678,9 +682,11 @@
                     <child type="label">
                       <object class="GtkLabel" id="label106">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Status Tracking&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Status Tracking</property>
                         <property name="use_underline">True</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
@@ -845,9 +851,11 @@
                     <child type="label">
                       <object class="GtkLabel" id="label111">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Return Notification&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Return Notification</property>
                         <property name="use_underline">True</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
-- 
cgit