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.
---
 calendar/gui/dialogs/alarm-dialog.ui      | 18 +++++++----
 calendar/gui/dialogs/cal-prefs-dialog.ui  | 54 ++++++++++++++++++++-----------
 calendar/gui/dialogs/recurrence-page.ui   | 17 +++++++---
 calendar/gui/dialogs/task-details-page.ui | 12 ++++---
 4 files changed, 68 insertions(+), 33 deletions(-)

(limited to 'calendar')

diff --git a/calendar/gui/dialogs/alarm-dialog.ui b/calendar/gui/dialogs/alarm-dialog.ui
index 21d04c1a3f..94ae8009c4 100644
--- a/calendar/gui/dialogs/alarm-dialog.ui
+++ b/calendar/gui/dialogs/alarm-dialog.ui
@@ -148,9 +148,8 @@
             <child>
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;Alarm&lt;/b&gt;</property>
+                <property name="label" translatable="yes">Alarm</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>
@@ -162,6 +161,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>
@@ -307,9 +309,8 @@
             <child>
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;Repeat&lt;/b&gt;</property>
+                <property name="label" translatable="yes">Repeat</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>
@@ -321,6 +322,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>
@@ -489,9 +493,8 @@
             <child>
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;Options&lt;/b&gt;</property>
+                <property name="label" translatable="yes">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>
@@ -503,6 +506,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>
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.ui b/calendar/gui/dialogs/cal-prefs-dialog.ui
index 263221793d..be78a8f828 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.ui
+++ b/calendar/gui/dialogs/cal-prefs-dialog.ui
@@ -136,8 +136,10 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">&lt;span weight="bold"&gt;Time&lt;/span&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">Time</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -361,8 +363,10 @@
           <object class="GtkLabel" id="label5">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">&lt;span weight="bold"&gt;Work Week&lt;/span&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">Work Week</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -682,8 +686,10 @@
           <object class="GtkLabel" id="label6">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">&lt;span weight="bold"&gt;Alerts&lt;/span&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">Alerts</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -877,8 +883,10 @@
           <object class="GtkLabel" id="label17">
             <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>
@@ -1031,8 +1039,10 @@
           <object class="GtkLabel" id="label18">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">&lt;span weight="bold"&gt;Task List&lt;/span&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">Task List</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -1192,9 +1202,8 @@
         <child>
           <object class="GtkLabel" id="label65">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;span weight="bold"&gt;Date/Time Format&lt;/span&gt;</property>
+            <property name="label" translatable="yes">Date/Time Format</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>
@@ -1206,6 +1215,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>
@@ -1284,9 +1296,8 @@
         <child>
           <object class="GtkLabel" id="label67">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;span weight="bold"&gt;Alarms&lt;/span&gt;</property>
+            <property name="label" translatable="yes">Alarms</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>
@@ -1298,6 +1309,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>
@@ -1397,8 +1411,10 @@
           <object class="GtkLabel" id="label25">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">&lt;span weight="bold"&gt;Default Free/Busy Server&lt;/span&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">Default Free/Busy Server</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -1456,9 +1472,11 @@
                 <child>
                   <object class="GtkLabel" id="label32">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;i&gt;%u and %d will be replaced by user and domain from the email address.&lt;/i&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">%u and %d will be replaced by user and domain from the email address.</property>
                     <property name="wrap">True</property>
+                    <attributes>
+                      <attribute name="style" value="italic"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/calendar/gui/dialogs/recurrence-page.ui b/calendar/gui/dialogs/recurrence-page.ui
index f5f9f13524..3d1d9f723c 100644
--- a/calendar/gui/dialogs/recurrence-page.ui
+++ b/calendar/gui/dialogs/recurrence-page.ui
@@ -67,9 +67,8 @@
         <child>
           <object class="GtkLabel" id="label71">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;b&gt;Recurrence&lt;/b&gt;</property>
+            <property name="label" translatable="yes">Recurrence</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>
@@ -81,6 +80,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>
@@ -324,9 +326,8 @@
         <child>
           <object class="GtkLabel" id="label73">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;b&gt;Exceptions&lt;/b&gt;</property>
+            <property name="label" translatable="yes">Exceptions</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>
@@ -338,6 +339,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>
@@ -526,7 +530,7 @@
         <child>
           <object class="GtkLabel" id="label70">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;b&gt;Preview&lt;/b&gt;</property>
+            <property name="label" translatable="yes">Preview</property>
             <property name="use_underline">False</property>
             <property name="use_markup">True</property>
             <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -540,6 +544,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>
diff --git a/calendar/gui/dialogs/task-details-page.ui b/calendar/gui/dialogs/task-details-page.ui
index cd82f1dce0..df6baef653 100644
--- a/calendar/gui/dialogs/task-details-page.ui
+++ b/calendar/gui/dialogs/task-details-page.ui
@@ -70,9 +70,8 @@
         <child>
           <object class="GtkLabel" id="label20">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;span weight="bold"&gt;Status&lt;/span&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>
@@ -84,6 +83,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="label22">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;span weight="bold"&gt;Miscellaneous&lt;/span&gt;</property>
+            <property name="label" translatable="yes">Miscellaneous</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">0</property>
-- 
cgit