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.

7 files changed, 57 insertions, 29 deletions

diff --git a/plugins/exchange-operations/exchange-oof.ui b/plugins/exchange-operations/exchange-oof.ui
index f7a0ca3b53..8e4c3b3df7 100644
--- a/plugins/exchange-operations/exchange-oof.ui
+++ b/plugins/exchange-operations/exchange-oof.ui
@@ -281,10 +281,9 @@ Would you like to change your status to "In the Office"? </property>
                 <child>
                   <object class="GtkLabel" id="label6">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;small&gt;The message specified below will be automatically sent to each person who sends
-mail to you while you are out of the office.&lt;/small&gt;</property>
+                    <property name="label" translatable="yes">The message specified below will be automatically sent to each person who sends
+mail to you while you are out of the office.</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>
@@ -292,6 +291,9 @@ mail to you while you are out of the office.&lt;/small&gt;</property>
                     <property name="yalign">0.5</property>
                     <property name="xpad">0</property>
                     <property name="ypad">0</property>
+                    <attributes>
+                      <attribute name="scale" value="0.8"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="padding">0</property>
@@ -318,9 +320,8 @@ mail to you while you are out of the office.&lt;/small&gt;</property>
                 <child>
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Status:&lt;/b&gt;</property>
+                    <property name="label" translatable="yes">Status:</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>
@@ -328,6 +329,9 @@ mail to you while you are out of the office.&lt;/small&gt;</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="left_attach">0</property>
@@ -457,9 +461,8 @@ mail to you while you are out of the office.&lt;/small&gt;</property>
                 <child type="label">
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Out of Office Message:&lt;/b&gt;</property>
+                    <property name="label" translatable="yes">Out of Office Message:</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>
@@ -467,6 +470,9 @@ mail to you while you are out of the office.&lt;/small&gt;</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>
                 </child>
               </object>
diff --git a/plugins/exchange-operations/exchange-permissions-dialog.ui b/plugins/exchange-operations/exchange-permissions-dialog.ui
index 7433ca6393..327a7eeedf 100644
--- a/plugins/exchange-operations/exchange-permissions-dialog.ui
+++ b/plugins/exchange-operations/exchange-permissions-dialog.ui
@@ -150,9 +150,8 @@
             <child>
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;Permissions&lt;/b&gt;</property>
+                <property name="label" translatable="yes">Permissions</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>
@@ -160,6 +159,9 @@
                 <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="left_attach">0</property>
diff --git a/plugins/exchange-operations/exchange-send-options.ui b/plugins/exchange-operations/exchange-send-options.ui
index edb71f8e4c..d94795d363 100644
--- a/plugins/exchange-operations/exchange-send-options.ui
+++ b/plugins/exchange-operations/exchange-send-options.ui
@@ -116,9 +116,8 @@
                 <child>
                   <object class="GtkLabel" id="msg_settings_label">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Message Settings&lt;/b&gt;</property>
+                    <property name="label" translatable="yes">Message Settings</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>
@@ -130,6 +129,9 @@
                     <property name="width_chars">-1</property>
                     <property name="single_line_mode">False</property>
                     <property name="angle">0</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="padding">0</property>
@@ -338,9 +340,8 @@
                 <child>
                   <object class="GtkLabel" id="Track_options_label">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Tracking Options&lt;/b&gt;</property>
+                    <property name="label" translatable="yes">Tracking Options</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>
@@ -352,6 +353,9 @@
                     <property name="width_chars">-1</property>
                     <property name="single_line_mode">False</property>
                     <property name="angle">0</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="padding">6</property>
diff --git a/plugins/groupwise-features/junk-settings.ui b/plugins/groupwise-features/junk-settings.ui
index bf1d6b2654..b998c90920 100644
--- a/plugins/groupwise-features/junk-settings.ui
+++ b/plugins/groupwise-features/junk-settings.ui
@@ -180,9 +180,8 @@
                                     <child>
                                       <object class="GtkLabel" id="users">
                                         <property name="visible">True</property>
-                                        <property name="label" translatable="yes">&lt;b&gt;Junk List:&lt;/b&gt;</property>
+                                        <property name="label" translatable="yes">Junk List:</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>
@@ -194,6 +193,9 @@
                                         <property name="width_chars">-1</property>
                                         <property name="single_line_mode">False</property>
                                         <property name="angle">0</property>
+                                        <attributes>
+                                          <attribute name="weight" value="bold"/>
+                                        </attributes>
                                       </object>
                                       <packing>
                                         <property name="padding">6</property>
diff --git a/plugins/groupwise-features/proxy-add-dialog.ui b/plugins/groupwise-features/proxy-add-dialog.ui
index c0e09ef421..e1050f4f4f 100644
--- a/plugins/groupwise-features/proxy-add-dialog.ui
+++ b/plugins/groupwise-features/proxy-add-dialog.ui
@@ -230,9 +230,8 @@
                     <child type="label">
                       <object class="GtkLabel" id="label13">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Name&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">Name</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>
@@ -244,6 +243,9 @@
                         <property name="width_chars">-1</property>
                         <property name="single_line_mode">False</property>
                         <property name="angle">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
diff --git a/plugins/imap-features/imap-headers.ui b/plugins/imap-features/imap-headers.ui
index 8d3d60e7b7..4a1991252e 100644
--- a/plugins/imap-features/imap-headers.ui
+++ b/plugins/imap-features/imap-headers.ui
@@ -119,9 +119,8 @@ this if you do not have filters based on mailing lists</property>
         <child type="label">
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;b&gt;IMAP Headers&lt;/b&gt;</property>
+            <property name="label" translatable="yes">IMAP Headers</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">True</property>
@@ -133,6 +132,9 @@ this if you do not have filters based on mailing lists</property>
             <property name="width_chars">-1</property>
             <property name="single_line_mode">False</property>
             <property name="angle">0</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
         </child>
       </object>
@@ -300,9 +302,8 @@ can ignore this if you choose "All Headers".</property>
         <child type="label">
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;b&gt;Custom Headers&lt;/b&gt;</property>
+            <property name="label" translatable="yes">Custom Headers</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">True</property>
@@ -314,6 +315,9 @@ can ignore this if you choose "All Headers".</property>
             <property name="width_chars">-1</property>
             <property name="single_line_mode">False</property>
             <property name="angle">0</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
         </child>
       </object>
diff --git a/plugins/publish-calendar/publish-calendar.ui b/plugins/publish-calendar/publish-calendar.ui
index f60bc9090b..aedb323ad6 100644
--- a/plugins/publish-calendar/publish-calendar.ui
+++ b/plugins/publish-calendar/publish-calendar.ui
@@ -100,8 +100,10 @@
           <object class="GtkLabel" id="label22">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">&lt;span weight="bold"&gt;General&lt;/span&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">General</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -266,8 +268,10 @@
           <object class="GtkLabel" id="label23">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">&lt;span weight="bold"&gt;Sources&lt;/span&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">Sources</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -330,8 +334,10 @@
           <object class="GtkLabel" id="label30">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">&lt;span weight="bold"&gt;Location&lt;/span&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">Location</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -482,8 +488,10 @@
           <object class="GtkLabel" id="optional_label">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">&lt;span weight="bold"&gt;Optional Information&lt;/span&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">Optional Information</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
             <property name="expand">False</property>