[gnome-games] Sudoku: Remove markup in translatable strings



commit e92bbfe9e602f3d32f5e80e448cef3a08f2e9edd
Author: Claude Paroz <claude 2xlibre net>
Date:   Fri Apr 9 22:00:26 2010 +0200

    Sudoku: Remove markup in translatable strings
    
    GNOME bug #559885

 gnome-sudoku/data/print_games.ui      |   25 +++++++++++++-------
 gnome-sudoku/data/puzzle_generator.ui |   41 +++++++++++++++++++++-----------
 gnome-sudoku/data/select_game.ui      |   16 +++++++++----
 3 files changed, 54 insertions(+), 28 deletions(-)
---
diff --git a/gnome-sudoku/data/print_games.ui b/gnome-sudoku/data/print_games.ui
index dea1a81..d898f5f 100644
--- a/gnome-sudoku/data/print_games.ui
+++ b/gnome-sudoku/data/print_games.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.14"/>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="value">4</property>
@@ -33,8 +33,11 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;span size="larger" weight="bold"&gt;Print Games&lt;/span&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">Print Games</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                  <attribute name="scale" value="1.2"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -120,10 +123,12 @@
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;&lt;i&gt;Levels of difficulty to print&lt;/i&gt;&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-                <property name="use_underline">True</property>
+                <property name="label" translatable="yes">Levels of difficulty to print</property>
                 <property name="wrap">True</property>
+                <attributes>
+                  <attribute name="style" value="italic"/>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -207,10 +212,12 @@
               <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;&lt;i&gt;Details&lt;/i&gt;&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-                <property name="use_underline">True</property>
+                <property name="label" translatable="yes">Details</property>
                 <property name="wrap">True</property>
+                <attributes>
+                  <attribute name="style" value="italic"/>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/gnome-sudoku/data/puzzle_generator.ui b/gnome-sudoku/data/puzzle_generator.ui
index a82a550..8fa1f75 100644
--- a/gnome-sudoku/data/puzzle_generator.ui
+++ b/gnome-sudoku/data/puzzle_generator.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.14"/>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="value">1</property>
@@ -34,8 +34,11 @@
                       <object class="GtkLabel" id="label16">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;span size="larger" weight="bold"&gt;Puzzle Generator&lt;/span&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Puzzle Generator</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                          <attribute name="scale" value="1.2"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -66,8 +69,11 @@
                           <object class="GtkLabel" id="label17">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">&lt;i&gt;&lt;u&gt;Number of Puzzles&lt;/u&gt;&lt;/i&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes">Number of Puzzles</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="underline" value="True"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -80,8 +86,10 @@
                           <object class="GtkLabel" id="label18">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">&lt;i&gt;Easy:&lt;/i&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes">Easy:</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="top_attach">1</property>
@@ -94,8 +102,10 @@
                           <object class="GtkLabel" id="label19">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">&lt;i&gt;Medium:&lt;/i&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes">Medium:</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="top_attach">2</property>
@@ -108,8 +118,10 @@
                           <object class="GtkLabel" id="label20">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">&lt;i&gt;Hard:&lt;/i&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes">Hard:</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="top_attach">3</property>
@@ -122,9 +134,10 @@
                           <object class="GtkLabel" id="label21">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">&lt;i&gt;Very Hard:&lt;/i&gt;</property>
-                            <property name="use_markup">True</property>
-                            <property name="use_underline">True</property>
+                            <property name="label" translatable="yes">Very Hard:</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="top_attach">4</property>
diff --git a/gnome-sudoku/data/select_game.ui b/gnome-sudoku/data/select_game.ui
index aae9f2c..8b6a5f4 100644
--- a/gnome-sudoku/data/select_game.ui
+++ b/gnome-sudoku/data/select_game.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.14"/>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="dialog1">
     <property name="width_request">700</property>
@@ -38,9 +38,12 @@
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;&lt;span size="large"&gt;_New Game&lt;/span&gt;&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">_New Game</property>
                         <property name="use_underline">True</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                          <attribute name="scale" value="1.2"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -65,9 +68,12 @@
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;&lt;span size="large"&gt;_Saved Games&lt;/span&gt;&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">_Saved Games</property>
                         <property name="use_underline">True</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                          <attribute name="scale" value="1.2"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="expand">False</property>



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