[seahorse] Remove markup from UI files



commit 86ae11ee5e840d0936d1ae19e24b47fde63a8043
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Sat Nov 10 14:16:27 2012 +0100

    Remove markup from UI files

 gkr/seahorse-gkr-item-properties.xml        |   14 +++--
 pgp/seahorse-keyserver-search.xml           |   14 +++--
 pgp/seahorse-pgp-generate.xml               |    8 ++-
 pgp/seahorse-pgp-private-key-properties.xml |   92 ++++++++++++++++--------
 pgp/seahorse-pgp-public-key-properties.xml  |  104 ++++++++++++++++++---------
 pgp/seahorse-sign.xml                       |   25 +++++--
 pkcs11/seahorse-pkcs11-generate.xml         |    8 ++-
 src/seahorse-generate-select.xml            |    8 ++-
 src/seahorse-key-manager.xml                |    9 ++-
 ssh/seahorse-ssh-generate.xml               |   14 +++--
 ssh/seahorse-ssh-key-properties.xml         |   62 +++++++++++------
 ssh/seahorse-ssh-upload.xml                 |    6 +-
 12 files changed, 240 insertions(+), 124 deletions(-)
---
diff --git a/gkr/seahorse-gkr-item-properties.xml b/gkr/seahorse-gkr-item-properties.xml
index 7e38ecb..3f4733a 100644
--- a/gkr/seahorse-gkr-item-properties.xml
+++ b/gkr/seahorse-gkr-item-properties.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="3.0"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="gkr-item-properties">
     <property name="visible">True</property>
@@ -258,8 +258,10 @@
                     <child type="label">
                       <object class="GtkLabel" id="label22229">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Password:&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Password:</property>
+                        <attributes>
+                         <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
@@ -325,8 +327,10 @@
                     <child type="label">
                       <object class="GtkLabel" id="label108">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Technical Details:&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Technical Details:</property>
+                        <attributes>
+                         <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
diff --git a/pgp/seahorse-keyserver-search.xml b/pgp/seahorse-keyserver-search.xml
index aa43391..f36bf9b 100644
--- a/pgp/seahorse-keyserver-search.xml
+++ b/pgp/seahorse-keyserver-search.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="3.0"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkImage" id="search-image">
     <property name="stock">gtk-find</property>
@@ -124,8 +124,10 @@
                                   <object class="GtkLabel" id="label16">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Key Servers:&lt;/b&gt;</property>
-                                    <property name="use_markup">True</property>
+                                    <property name="label" translatable="yes">Key Servers:</property>
+                                    <attributes>
+                                     <attribute name="weight" value="bold"/>
+                                    </attributes>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -148,8 +150,10 @@
                                   <object class="GtkLabel" id="label17">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Shared Keys Near Me:&lt;/b&gt;</property>
-                                    <property name="use_markup">True</property>
+                                    <property name="label" translatable="yes">Shared Keys Near Me:</property>
+                                    <attributes>
+                                     <attribute name="weight" value="bold"/>
+                                    </attributes>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
diff --git a/pgp/seahorse-pgp-generate.xml b/pgp/seahorse-pgp-generate.xml
index 262b1d0..30e2d6a 100644
--- a/pgp/seahorse-pgp-generate.xml
+++ b/pgp/seahorse-pgp-generate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">512</property>
     <property name="upper">8192</property>
@@ -411,9 +411,11 @@
                       <object class="GtkLabel" id="label48">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">&lt;b&gt;_Advanced key options&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">_Advanced key options</property>
                         <property name="use_underline">True</property>
+                        <attributes>
+                         <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
diff --git a/pgp/seahorse-pgp-private-key-properties.xml b/pgp/seahorse-pgp-private-key-properties.xml
index 3721943..b05dda4 100644
--- a/pgp/seahorse-pgp-private-key-properties.xml
+++ b/pgp/seahorse-pgp-private-key-properties.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="3.0"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkListStore" id="model1">
     <columns>
@@ -67,8 +67,10 @@
                           <object class="GtkLabel" id="label22225">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">&lt;b&gt;This key has been revoked&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes">This key has been revoked</property>
+                            <attributes>
+                             <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -127,8 +129,10 @@
                           <object class="GtkLabel" id="label22227">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">&lt;b&gt;This key has expired&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes">This key has expired</property>
+                            <attributes>
+                             <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -382,8 +386,10 @@
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0</property>
-                                <property name="label" translatable="yes" comments="A photograph">&lt;b&gt;Photo &lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes" comments="A photograph">Photo </property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                             </child>
                           </object>
@@ -416,8 +422,10 @@
                                 <property name="visible">True</property>
                                 <property name="xalign">1</property>
                                 <property name="yalign">0</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Key ID:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Key ID:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="top_attach">5</property>
@@ -431,8 +439,10 @@
                                 <property name="visible">True</property>
                                 <property name="xalign">1</property>
                                 <property name="yalign">0</property>
-                                <property name="label" translatable="yes" context="name-of-key" comments="Name of key, usually a persons name">&lt;b&gt;Name:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes" context="name-of-key" comments="Name of key, usually a persons name">Name:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="top_attach">1</property>
@@ -445,8 +455,10 @@
                               <object class="GtkLabel" id="label22235">
                                 <property name="visible">True</property>
                                 <property name="xalign">1</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Email:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Email:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="top_attach">2</property>
@@ -459,8 +471,10 @@
                               <object class="GtkLabel" id="label22238">
                                 <property name="visible">True</property>
                                 <property name="xalign">1</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Comment:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Comment:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="top_attach">3</property>
@@ -536,8 +550,10 @@
                               <object class="GtkLabel" id="label22263">
                                 <property name="visible">True</property>
                                 <property name="xalign">1</property>
-                                <property name="label" translatable="yes" comments="To translators: This is the noun not the verb.">&lt;b&gt;Use:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes" comments="To translators: This is the noun not the verb.">Use:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
@@ -548,8 +564,10 @@
                               <object class="GtkLabel" id="label22264">
                                 <property name="visible">True</property>
                                 <property name="xalign">1</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Type:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Type:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="top_attach">4</property>
@@ -685,8 +703,10 @@
                   <object class="GtkLabel" id="label22261">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Key Names and Signatures&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Key Names and Signatures</property>
+                    <attributes>
+                     <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1131,8 +1151,10 @@
                             <child type="label">
                               <object class="GtkLabel" id="label22248">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Technical Details&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Technical Details</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                             </child>
                           </object>
@@ -1165,8 +1187,10 @@
                             <child type="label">
                               <object class="GtkLabel" id="label22250">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Fingerprint&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Fingerprint</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                             </child>
                           </object>
@@ -1294,8 +1318,10 @@
                             <child type="label">
                               <object class="GtkLabel" id="label22255">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Dates&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Dates</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                             </child>
                           </object>
@@ -1428,8 +1454,10 @@
                             <child type="label">
                               <object class="GtkLabel" id="label22257">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Actions&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Actions</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                             </child>
                           </object>
@@ -1670,9 +1698,11 @@
                     <child type="label">
                       <object class="GtkLabel" id="label33">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;_Subkeys&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">_Subkeys</property>
                         <property name="use_underline">True</property>
+                        <attributes>
+                         <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
diff --git a/pgp/seahorse-pgp-public-key-properties.xml b/pgp/seahorse-pgp-public-key-properties.xml
index 60e618e..6100b96 100644
--- a/pgp/seahorse-pgp-public-key-properties.xml
+++ b/pgp/seahorse-pgp-public-key-properties.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="3.0"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkListStore" id="model1">
     <columns>
@@ -66,8 +66,10 @@
                           <object class="GtkLabel" id="label114">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">&lt;b&gt;This key has been revoked&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes">This key has been revoked</property>
+                            <attributes>
+                             <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -126,8 +128,10 @@
                           <object class="GtkLabel" id="label116">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">&lt;b&gt;This key has expired&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes">This key has expired</property>
+                             <attributes>
+                             <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -302,8 +306,10 @@
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="yalign">0</property>
-                                    <property name="label" translatable="yes" comments="A photograph">&lt;b&gt;Photo &lt;/b&gt;</property>
-                                    <property name="use_markup">True</property>
+                                    <property name="label" translatable="yes" comments="A photograph">Photo </property>
+                                    <attributes>
+                                     <attribute name="weight" value="bold"/>
+                                    </attributes>
                                   </object>
                                 </child>
                               </object>
@@ -341,8 +347,10 @@
                               <object class="GtkLabel" id="label22227">
                                 <property name="visible">True</property>
                                 <property name="xalign">1</property>
-                                <property name="label" translatable="yes" comments="To translators: This is the noun not the verb.">&lt;b&gt;Use:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes" comments="To translators: This is the noun not the verb.">Use:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
@@ -367,8 +375,10 @@
                                 <property name="visible">True</property>
                                 <property name="xalign">1</property>
                                 <property name="yalign">0</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Key ID:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Key ID:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="top_attach">5</property>
@@ -398,8 +408,10 @@
                                 <property name="visible">True</property>
                                 <property name="xalign">1</property>
                                 <property name="yalign">0</property>
-                                <property name="label" translatable="yes" context="name-of-key" comments="Name of key, usually a persons name">&lt;b&gt;Name:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes" context="name-of-key" comments="Name of key, usually a persons name">Name:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="top_attach">1</property>
@@ -412,8 +424,10 @@
                               <object class="GtkLabel" id="label74">
                                 <property name="visible">True</property>
                                 <property name="xalign">1</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Email:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Email:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="top_attach">2</property>
@@ -426,8 +440,10 @@
                               <object class="GtkLabel" id="label91">
                                 <property name="visible">True</property>
                                 <property name="xalign">1</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Comment:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Comment:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="top_attach">3</property>
@@ -440,8 +456,10 @@
                               <object class="GtkLabel" id="label22229">
                                 <property name="visible">True</property>
                                 <property name="xalign">1</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Type:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Type:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="top_attach">4</property>
@@ -548,9 +566,11 @@
                             <child type="label">
                               <object class="GtkLabel" id="label28">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes" comments="Names set on the PGP key.">&lt;b&gt;_Other Names:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes" comments="Names set on the PGP key.">_Other Names:</property>
                                 <property name="use_underline">True</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                             </child>
                           </object>
@@ -615,8 +635,10 @@
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Your trust of this key&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes">Your trust of this key</property>
+                            <attributes>
+                             <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -860,9 +882,11 @@
                       <object class="GtkLabel" id="label99">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;_People who have signed this key:&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">_People who have signed this key:</property>
                         <property name="use_underline">True</property>
+                        <attributes>
+                         <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -962,8 +986,10 @@
                               <object class="GtkLabel" id="label108">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Technical Details:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Technical Details:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1089,8 +1115,10 @@
                               <object class="GtkLabel" id="label113">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Fingerprint:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Fingerprint:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1143,8 +1171,10 @@ B4C3 4349 0932 7854 3452</property>
                               <object class="GtkLabel" id="label110">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Dates:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Dates:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1238,8 +1268,10 @@ B4C3 4349 0932 7854 3452</property>
                               <object class="GtkLabel" id="label111">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Indicate Trust:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Indicate Trust:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1346,9 +1378,11 @@ B4C3 4349 0932 7854 3452</property>
                     <child type="label">
                       <object class="GtkLabel" id="label33">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;_Subkeys&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">_Subkeys</property>
                         <property name="use_underline">True</property>
+                        <attributes>
+                         <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
diff --git a/pgp/seahorse-sign.xml b/pgp/seahorse-sign.xml
index bf0a2eb..921491d 100644
--- a/pgp/seahorse-sign.xml
+++ b/pgp/seahorse-sign.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="3.0"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="sign">
     <property name="border_width">5</property>
@@ -51,9 +51,12 @@
                       <object class="GtkLabel" id="sign-uid-text">
                         <property name="visible">True</property>
                         <property name="yalign">0</property>
-                        <property name="label" translatable="yes">&lt;i&gt;Key Name&lt;/i&gt;</property>
+                        <property name="label" translatable="yes">Key Name</property>
                         <property name="use_markup">True</property>
                         <property name="justify">center</property>
+                        <attributes>
+                         <attribute name="style" value="italic"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -80,8 +83,10 @@
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;How carefully have you checked this key?&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">How carefully have you checked this key?</property>
+                    <attributes>
+                     <attribute name="weight" value="bold"/>
+                   </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -281,8 +286,10 @@
                   <object class="GtkLabel" id="label9">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;How others will see this signature:&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">How others will see this signature:</property>
+                    <attributes>
+                     <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -353,8 +360,10 @@
                   <object class="GtkLabel" id="label10">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Sign key as:&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Sign key as:</property>
+                    <attributes>
+                     <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/pkcs11/seahorse-pkcs11-generate.xml b/pkcs11/seahorse-pkcs11-generate.xml
index 873952d..539c0c4 100644
--- a/pkcs11/seahorse-pkcs11-generate.xml
+++ b/pkcs11/seahorse-pkcs11-generate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkHBox" id="pkcs11-generate">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -223,9 +223,11 @@
               <object class="GtkLabel" id="label48">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">&lt;b&gt;_Advanced key options&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">_Advanced key options</property>
                 <property name="use_underline">True</property>
+                <attributes>
+                 <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
             </child>
           </object>
diff --git a/src/seahorse-generate-select.xml b/src/seahorse-generate-select.xml
index 4e6b096..9635133 100644
--- a/src/seahorse-generate-select.xml
+++ b/src/seahorse-generate-select.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="3.0"/>
           <object class="GtkVBox" id="generate-select">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -12,9 +12,11 @@
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;_Select the type of item to create:&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">_Select the type of item to create:</property>
                 <property name="use_underline">True</property>
+                <attributes>
+                 <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/src/seahorse-key-manager.xml b/src/seahorse-key-manager.xml
index 2347104..30460de 100644
--- a/src/seahorse-key-manager.xml
+++ b/src/seahorse-key-manager.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="key-manager">
     <property name="can_focus">False</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -103,8 +103,11 @@
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="xpad">6</property>
-                            <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;First time options:&lt;/b&gt;&lt;/big&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes">First time options:</property>
+                            <attributes>
+                             <attribute name="scale" value="1.2"/>
+                             <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="expand">False</property>
diff --git a/ssh/seahorse-ssh-generate.xml b/ssh/seahorse-ssh-generate.xml
index b24a5d8..72023ba 100644
--- a/ssh/seahorse-ssh-generate.xml
+++ b/ssh/seahorse-ssh-generate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">512</property>
     <property name="upper">8192</property>
@@ -238,9 +238,11 @@
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="xpad">3</property>
-                                <property name="label" translatable="yes">&lt;i&gt;Your email address, or a reminder of what this key is for.&lt;/i&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Your email address, or a reminder of what this key is for.</property>
                                 <property name="wrap">True</property>
+                                <attributes>
+                                 <attribute name="style" value="italic"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -373,9 +375,11 @@
                       <object class="GtkLabel" id="label48">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">&lt;b&gt;_Advanced key options&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">_Advanced key options</property>
                         <property name="use_underline">True</property>
+                        <attributes>
+                         <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
diff --git a/ssh/seahorse-ssh-key-properties.xml b/ssh/seahorse-ssh-key-properties.xml
index a323f69..24ef34d 100644
--- a/ssh/seahorse-ssh-key-properties.xml
+++ b/ssh/seahorse-ssh-key-properties.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="3.0"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkImage" id="passphrase-image">
     <property name="stock">gtk-edit</property>
@@ -57,8 +57,10 @@
                           <object class="GtkLabel" id="label74">
                             <property name="visible">True</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Identifier:&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes">Identifier:</property>
+                            <attributes>
+                             <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="top_attach">3</property>
@@ -89,8 +91,10 @@
                             <property name="visible">True</property>
                             <property name="xalign">1</property>
                             <property name="yalign">0</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Type:&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes">Type:</property>
+                            <attributes>
+                             <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="top_attach">2</property>
@@ -121,8 +125,10 @@
                             <property name="visible">True</property>
                             <property name="xalign">1</property>
                             <property name="yalign">0</property>
-                            <property name="label" translatable="yes" context="name-of-ssh-key" comments="Name of key, often a persons name">&lt;b&gt;Name:&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes" context="name-of-ssh-key" comments="Name of key, often a persons name">Name:</property>
+                            <attributes>
+                             <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="top_attach">1</property>
@@ -167,8 +173,10 @@
                             <property name="visible">True</property>
                             <property name="xalign">1</property>
                             <property name="yalign">1</property>
-                            <property name="label" translatable="yes" comments="To translators: This is the noun not the verb.">&lt;b&gt;Use:&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes" comments="To translators: This is the noun not the verb.">Use:</property>
+                            <attributes>
+                             <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="x_options">GTK_FILL</property>
@@ -219,8 +227,10 @@
                       <object class="GtkLabel" id="label22226">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Trust&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Trust</property>
+                        <attributes>
+                         <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -321,8 +331,10 @@
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Algorithm:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Algorithm:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
@@ -334,8 +346,10 @@
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Strength:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Strength:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="top_attach">1</property>
@@ -380,8 +394,10 @@
                               <object class="GtkLabel" id="label113">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Location:&lt;/b&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="top_attach">2</property>
@@ -394,8 +410,10 @@
                               <object class="GtkLabel" id="label22231">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Fingerprint:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Fingerprint:</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="top_attach">3</property>
@@ -448,8 +466,10 @@
                     <child type="label">
                       <object class="GtkLabel" id="label108">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Technical Details:&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Technical Details:</property>
+                        <attributes>
+                         <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
diff --git a/ssh/seahorse-ssh-upload.xml b/ssh/seahorse-ssh-upload.xml
index 4335b4e..6dca25b 100644
--- a/ssh/seahorse-ssh-upload.xml
+++ b/ssh/seahorse-ssh-upload.xml
@@ -72,8 +72,10 @@
                           <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">&lt;i&gt;eg: fileserver.example.com:port&lt;/i&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes">eg: fileserver.example.com:port</property>
+                            <attributes>
+                             <attribute name="style" value="italic"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="expand">False</property>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]