aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/gui/contact-editor/contact-editor.ui60
-rw-r--r--addressbook/gui/contact-list-editor/contact-list-editor.ui6
-rw-r--r--calendar/gui/dialogs/alarm-dialog.ui18
-rw-r--r--calendar/gui/dialogs/cal-prefs-dialog.ui54
-rw-r--r--calendar/gui/dialogs/recurrence-page.ui17
-rw-r--r--calendar/gui/dialogs/task-details-page.ui12
-rw-r--r--filter/filter.ui6
-rw-r--r--mail/mail-config.ui204
-rw-r--r--mail/mail-dialogs.ui18
-rw-r--r--plugins/exchange-operations/exchange-oof.ui20
-rw-r--r--plugins/exchange-operations/exchange-permissions-dialog.ui6
-rw-r--r--plugins/exchange-operations/exchange-send-options.ui12
-rw-r--r--plugins/groupwise-features/junk-settings.ui6
-rw-r--r--plugins/groupwise-features/proxy-add-dialog.ui6
-rw-r--r--plugins/imap-features/imap-headers.ui12
-rw-r--r--plugins/publish-calendar/publish-calendar.ui24
-rw-r--r--smime/gui/smime-ui.ui48
-rw-r--r--widgets/e-timezone-dialog/e-timezone-dialog.ui12
-rw-r--r--widgets/misc/e-send-options.ui24
19 files changed, 377 insertions, 188 deletions
diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui
index e8104cb60d..964ce434c2 100644
--- a/addressbook/gui/contact-editor/contact-editor.ui
+++ b/addressbook/gui/contact-editor/contact-editor.ui
@@ -622,9 +622,8 @@
<child type="label">
<object class="GtkLabel" id="label400">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Email&lt;/b&gt;</property>
+ <property name="label" translatable="yes">Email</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>
@@ -636,6 +635,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>
@@ -973,9 +975,8 @@
<child>
<object class="GtkLabel" id="label399">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Telephone&lt;/b&gt;</property>
+ <property name="label" translatable="yes">Telephone</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>
@@ -987,6 +988,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>
@@ -1197,9 +1201,8 @@
<child type="label">
<object class="GtkLabel" id="label404">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Instant Messaging&lt;/b&gt;</property>
+ <property name="label" translatable="yes">Instant Messaging</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>
@@ -1211,6 +1214,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>
@@ -1504,9 +1510,8 @@
<child type="label">
<object class="GtkLabel" id="label410">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Web Addresses&lt;/b&gt;</property>
+ <property name="label" translatable="yes">Web Addresses</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>
@@ -1518,6 +1523,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>
@@ -1847,9 +1855,8 @@
<child type="label">
<object class="GtkLabel" id="label417">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Job&lt;/b&gt;</property>
+ <property name="label" translatable="yes">Job</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>
@@ -1861,6 +1868,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>
@@ -2090,9 +2100,8 @@
<child type="label">
<object class="GtkLabel" id="label421">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Miscellaneous&lt;/b&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>
@@ -2104,6 +2113,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>
@@ -2495,9 +2507,8 @@
<child type="label">
<object class="GtkLabel" id="frame73">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Home&lt;/b&gt;</property>
+ <property name="label" translatable="yes">Home</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>
@@ -2509,6 +2520,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>
@@ -2870,9 +2884,8 @@
<child type="label">
<object class="GtkLabel" id="label460">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Work&lt;/b&gt;</property>
+ <property name="label" translatable="yes">Work</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>
@@ -2884,6 +2897,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>
@@ -3245,9 +3261,8 @@
<child type="label">
<object class="GtkLabel" id="label467">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Other&lt;/b&gt;</property>
+ <property name="label" translatable="yes">Other</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>
@@ -3259,6 +3274,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>
@@ -3364,9 +3382,8 @@
<child type="label">
<object class="GtkLabel" id="label475">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Notes&lt;/b&gt;</property>
+ <property name="label" translatable="yes">Notes</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>
@@ -3378,6 +3395,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/addressbook/gui/contact-list-editor/contact-list-editor.ui b/addressbook/gui/contact-list-editor/contact-list-editor.ui
index 37d0d94746..0c1e21cf68 100644
--- a/addressbook/gui/contact-list-editor/contact-list-editor.ui
+++ b/addressbook/gui/contact-list-editor/contact-list-editor.ui
@@ -108,8 +108,10 @@
<object class="GtkLabel" id="members-label">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property context="yes" name="label" translatable="yes">&lt;b&gt;Members&lt;/b&gt;</property>
- <property name="use_markup">True</property>
+ <property context="yes" name="label" translatable="yes">Members</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
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>
diff --git a/filter/filter.ui b/filter/filter.ui
index d8791626da..10c293cf9c 100644
--- a/filter/filter.ui
+++ b/filter/filter.ui
@@ -132,9 +132,11 @@
<object class="GtkLabel" id="rule_label">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;_Filter Rules&lt;/b&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">_Filter Rules</property>
<property name="use_underline">True</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index df7cde0753..4be7831a89 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -109,8 +109,10 @@
<object class="GtkLabel" id="label470">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Account Information&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Account Information</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -217,8 +219,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label464">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Required Information&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Required Information</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -340,8 +344,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label466">
<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>
@@ -629,8 +635,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label472">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Configuration&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Configuration</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -771,9 +779,11 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label515">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Security&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Security</property>
<property name="mnemonic_widget">source_auth_dropdown</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -860,9 +870,11 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label514">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;SSL is not supported in this build of Evolution&lt;/b&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">SSL is not supported in this build of Evolution</property>
<property name="justify">center</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -901,10 +913,12 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label474">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;_Authentication Type&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">_Authentication Type</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">source_auth_dropdown</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -1111,8 +1125,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label476">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Server Configuration&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Server Configuration</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -1222,8 +1238,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label517">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Security&lt;/span&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="expand">False</property>
@@ -1308,9 +1326,11 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="transport_ssl_disabled_label">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;SSL is not supported in this build of Evolution&lt;/b&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">SSL is not supported in this build of Evolution</property>
<property name="justify">center</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -1347,8 +1367,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label478">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Authentication&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Authentication</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -1544,8 +1566,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label482">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Sent and Draft Messages&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Sent and Draft Messages</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -1729,8 +1753,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label484">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Composing Messages&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Composing Messages</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -1929,8 +1955,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label578">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Message Receipts&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Message Receipts</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -2015,8 +2043,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label486">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Pretty Good Privacy (PGP/GPG)&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Pretty Good Privacy (PGP/GPG)</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -2171,8 +2201,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label519">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Secure MIME (S/MIME)&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Secure MIME (S/MIME)</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -2604,8 +2636,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label492">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Message Fonts&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Message Fonts</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -2754,8 +2788,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label494">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Message Display&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Message Display</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -3094,8 +3130,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label496">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Delete Mail&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Delete Mail</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -3225,8 +3263,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label530">
<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>
@@ -3306,8 +3346,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label500">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Loading Images&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Loading Images</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -3429,8 +3471,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label502">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Labels&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Labels</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -3484,8 +3528,10 @@ ple: "Work" or "Personal"</property>
<child>
<object class="GtkLabel" id="label587">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Sender Photograph&lt;/b&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Sender Photograph</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -3574,10 +3620,12 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label524">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Displayed Message _Headers&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Displayed Message _Headers</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">txtHeaders</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -3698,10 +3746,12 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label591">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Date/Time Format&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Date/Time Format</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">txtHeaders</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -3782,8 +3832,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label526">
<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>
@@ -4136,8 +4188,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label504">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Default Behavior&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Default Behavior</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -4442,8 +4496,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label506">
<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>
@@ -4555,9 +4611,11 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label548">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Sig_natures&lt;/b&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Sig_natures</property>
<property name="use_underline">True</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -4591,8 +4649,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label551">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Preview&lt;/b&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Preview</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -4675,10 +4735,12 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label534">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;_Languages&lt;/b&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">_Languages</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">listSpellCheckLanguage</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -4812,8 +4874,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label508">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Options&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Options</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -4945,8 +5009,10 @@ ple: "Work" or "Personal"</property>
<object class="GtkLabel" id="label512">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Printed Fonts&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Printed Fonts</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -5291,8 +5357,10 @@ for display purposes only. </property>
<object class="GtkLabel" id="label76">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Proxy Settings&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Proxy Settings</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="position">0</property>
diff --git a/mail/mail-dialogs.ui b/mail/mail-dialogs.ui
index 2d123d6c43..3f9df5adac 100644
--- a/mail/mail-dialogs.ui
+++ b/mail/mail-dialogs.ui
@@ -27,8 +27,10 @@
<object class="GtkLabel" id="label464">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Digital Signature&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Digital Signature</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -90,8 +92,10 @@
<object class="GtkLabel" id="label477">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;span weight="bold"&gt;Encryption&lt;/span&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Encryption</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -669,8 +673,10 @@ elect a follow up action from the "Flag" menu.</property>
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Search Folder Sources&lt;/b&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Search Folder Sources</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
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>
diff --git a/smime/gui/smime-ui.ui b/smime/gui/smime-ui.ui
index 42be5f47a2..7eddf6a8c6 100644
--- a/smime/gui/smime-ui.ui
+++ b/smime/gui/smime-ui.ui
@@ -186,9 +186,8 @@
<child type="label">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;This certificate has been verified for the following uses:&lt;/b&gt;</property>
+ <property name="label" translatable="yes">This certificate has been verified for the following uses:</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>
@@ -200,6 +199,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>
@@ -231,9 +233,8 @@
<child>
<object class="GtkLabel" id="label25">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Issued To&lt;/b&gt;</property>
+ <property name="label" translatable="yes">Issued To</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>
@@ -245,6 +246,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="left_attach">0</property>
@@ -501,9 +505,8 @@
<child>
<object class="GtkLabel" id="label30">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Issued By&lt;/b&gt;</property>
+ <property name="label" translatable="yes">Issued By</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>
@@ -515,6 +518,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="left_attach">0</property>
@@ -528,9 +534,8 @@
<child>
<object class="GtkLabel" id="label35">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Fingerprints&lt;/b&gt;</property>
+ <property name="label" translatable="yes">Fingerprints</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>
@@ -542,6 +547,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="left_attach">0</property>
@@ -917,9 +925,8 @@
<child>
<object class="GtkLabel" id="label34">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Validity&lt;/b&gt;</property>
+ <property name="label" translatable="yes">Validity</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>
@@ -931,6 +938,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="left_attach">0</property>
@@ -1012,9 +1022,8 @@
<child type="label">
<object class="GtkLabel" id="label51">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Certificate Hierarchy&lt;/b&gt;</property>
+ <property name="label" translatable="yes">Certificate Hierarchy</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>
@@ -1026,6 +1035,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>
@@ -1068,9 +1080,8 @@
<child type="label">
<object class="GtkLabel" id="label52">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Certificate Fields&lt;/b&gt;</property>
+ <property name="label" translatable="yes">Certificate Fields</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>
@@ -1082,6 +1093,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>
@@ -1129,9 +1143,8 @@
<child type="label">
<object class="GtkLabel" id="label53">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Field Value&lt;/b&gt;</property>
+ <property name="label" translatable="yes">Field Value</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>
@@ -1143,6 +1156,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/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>