Remove unnecessary markup from translatable strings.

Now that attribute parsing is available for GtkBuilder files, I've
fially fixed bug 112962 and replaced strings of the form <b>foo</b>
with plain foo and set the text attributes appropriately. Obviously
this doesn't affect strings with embedded markup, only those with
global markup. This should make life easier for translators.

1 files changed, 89 insertions, 63 deletions

diff --git a/trashapplet/trashapplet-empty-progress.ui b/trashapplet/trashapplet-empty-progress.ui
index 26f9413eb..1b075d61e 100644
--- a/trashapplet/trashapplet-empty-progress.ui
+++ b/trashapplet/trashapplet-empty-progress.ui
@@ -1,98 +1,124 @@
-<?xml version='1.0' encoding='utf-8'?>
-
+<?xml version="1.0"?>
 <interface>
-  <object class='GtkDialog' id='empty_trash'>
-    <property name='border_width'>6</property>
-    <property name='title' translatable="yes">Emptying the Trash</property>
-    <property name='default_width'>400</property>
-    <property name='has_separator'>False</property>
-
-    <child internal-child='vbox'>
-      <object class='GtkVBox' id='dialog-vbox1'>
-
-        <child internal-child='action_area'>
-          <object class='GtkHButtonBox' id='dialog-action_area1'>
-
-            <child>
-              <object class='GtkButton' id='cancel_button'>
-                <property name='visible'>True</property>
-                <property name='label'>gtk-cancel</property>
-                <property name='use_stock'>True</property>
-              </object>
-            </child>
-          </object>
-        </child>
-
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkDialog" id="empty_trash">
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">Emptying the Trash</property>
+    <property name="default_width">400</property>
+    <property name="type_hint">normal</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
         <child>
-          <object class='GtkVBox' id='vbox1'>
-            <property name='visible'>True</property>
-            <property name='border_width'>6</property>
-            <property name='spacing'>12</property>
-
+          <object class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="border_width">6</property>
+            <property name="spacing">12</property>
             <child>
-              <object class='GtkLabel' id='label1'>
-                <property name='visible'>True</property>
-                <property name='label' translatable="yes">&lt;big&gt;&lt;b&gt;Emptying the Trash&lt;/b&gt;&lt;/big&gt;</property>
-                <property name='use_markup'>True</property>
-                <property name='xalign'>0</property>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Emptying the Trash</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                  <attribute name="scale" value="1.300000"/>
+                </attributes>
               </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
             </child>
-
             <child>
-              <object class='GtkHBox' id='hbox1'>
-                <property name='visible'>True</property>
-
+              <object class="GtkHBox" id="hbox1">
+                <property name="visible">True</property>
                 <child>
-                  <object class='GtkLabel' id='label3'>
-                    <property name='label' translatable="yes">&lt;b&gt;From:&lt;/b&gt;</property>
-                    <property name='use_markup'>True</property>
+                  <object class="GtkLabel" id="label3">
+                    <property name="label" translatable="yes">From:</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
-                    <property name='expand'>False</property>
+                    <property name="expand">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
-
                 <child>
-                  <object class='GtkLabel' id='location_label'>
-                    <property name='visible'>True</property>
-                    <property name='xalign'>0.0</property>
-                    <property name='ellipsize'>PANGO_ELLIPSIZE_MIDDLE</property>
+                  <object class="GtkLabel" id="location_label">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="ellipsize">middle</property>
                   </object>
                   <packing>
-                    <property name='fill'>True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
             </child>
-
             <child>
-              <object class='GtkVBox' id='vbox2'>
-                <property name='visible'>True</property>
-
+              <object class="GtkVBox" id="vbox2">
+                <property name="visible">True</property>
                 <child>
-                  <object class='GtkProgressBar' id='progressbar'>
-                    <property name='visible'>True</property>
-                    <property name='text'>  </property>
+                  <object class="GtkProgressBar" id="progressbar">
+                    <property name="visible">True</property>
+                    <property name="text">  </property>
                   </object>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
-
                 <child>
-                  <object class='GtkLabel' id='file_label'>
-                    <property name='visible'>True</property>
-                    <property name='label'>  </property>
-                    <property name='xalign'>0</property>
-                    <property name='ellipsize'>PANGO_ELLIPSIZE_END</property>
+                  <object class="GtkLabel" id="file_label">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label">  </property>
+                    <property name="ellipsize">end</property>
                   </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <child>
+              <object class="GtkButton" id="cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
         </child>
       </object>
     </child>
-
     <action-widgets>
-      <action-widget response='-6'>cancel_button</action-widget>
+      <action-widget response="-6">cancel_button</action-widget>
     </action-widgets>
   </object>
 </interface>