[PATCH 4/5] Buttons shouldn't scream at people (#868536, mizmo).

Chris Lumens clumens at redhat.com
Fri Nov 9 21:14:57 UTC 2012


---
 pyanaconda/ui/gui/hubs/progress.glade  |  2 +-
 pyanaconda/ui/gui/hubs/summary.glade   |  4 ++--
 pyanaconda/ui/gui/spokes/custom.glade  |  2 +-
 pyanaconda/ui/gui/spokes/source.glade  | 10 +++++-----
 pyanaconda/ui/gui/spokes/storage.glade |  4 ++--
 widgets/src/StandaloneWindow.c         |  4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pyanaconda/ui/gui/hubs/progress.glade b/pyanaconda/ui/gui/hubs/progress.glade
index fcc0f21..37bd0bb 100644
--- a/pyanaconda/ui/gui/hubs/progress.glade
+++ b/pyanaconda/ui/gui/hubs/progress.glade
@@ -186,7 +186,7 @@ for you to use!  Go ahead and reboot to start using it!</property>
                             </child>
                             <child>
                               <object class="GtkButton" id="rebootButton">
-                                <property name="label" translatable="yes">_REBOOT</property>
+                                <property name="label" translatable="yes">_Reboot</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
diff --git a/pyanaconda/ui/gui/hubs/summary.glade b/pyanaconda/ui/gui/hubs/summary.glade
index 92e3949..2fd4065 100644
--- a/pyanaconda/ui/gui/hubs/summary.glade
+++ b/pyanaconda/ui/gui/hubs/summary.glade
@@ -70,7 +70,7 @@
             <property name="margin_bottom">6</property>
             <child>
               <object class="GtkButton" id="quitButton">
-                <property name="label" translatable="yes">_QUIT</property>
+                <property name="label" translatable="yes">_Quit</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -88,7 +88,7 @@
             </child>
             <child>
               <object class="GtkButton" id="continueButton">
-                <property name="label" translatable="yes">_BEGIN INSTALLATION</property>
+                <property name="label" translatable="yes">_Begin Installation</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade
index 2f5ec47..b53236d 100644
--- a/pyanaconda/ui/gui/spokes/custom.glade
+++ b/pyanaconda/ui/gui/spokes/custom.glade
@@ -1548,7 +1548,7 @@ you'll be able to view their details here.</property>
             </child>
             <child>
               <object class="GtkButton" id="finishPartitionsButton">
-                <property name="label" translatable="yes">_FINISH PARTITIONING</property>
+                <property name="label" translatable="yes">_Finish Partitioning</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/pyanaconda/ui/gui/spokes/source.glade b/pyanaconda/ui/gui/spokes/source.glade
index 4d6fe05..8ff450f 100644
--- a/pyanaconda/ui/gui/spokes/source.glade
+++ b/pyanaconda/ui/gui/spokes/source.glade
@@ -79,7 +79,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">WHERE IS THE YUM REPOSITORY FOR YOUR ADD-ON?</property>
+                <property name="label" translatable="yes">Where is the yum repository for your add-on?</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -589,7 +589,7 @@ TeXlive 2012 repository</col>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="proxyCancelButton">
-                <property name="label" translatable="yes">_CANCEL</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -604,7 +604,7 @@ TeXlive 2012 repository</col>
             </child>
             <child>
               <object class="GtkButton" id="proxyAddButton">
-                <property name="label" translatable="yes">_ADD</property>
+                <property name="label" translatable="yes">_Add</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -865,7 +865,7 @@ TeXlive 2012 repository</col>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">WHICH INSTALLATION SOURCE WOULD YOU LIKE TO USE?</property>
+                    <property name="label" translatable="yes">Which installation source would you like to use?</property>
                     <attributes>
                       <attribute name="font-desc" value="Cantarell 10"/>
                       <attribute name="weight" value="bold"/>
@@ -1188,7 +1188,7 @@ TeXlive 2012 repository</col>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="margin_top">12</property>
-                    <property name="label" translatable="yes">UPDATES</property>
+                    <property name="label" translatable="yes">Updates</property>
                     <attributes>
                       <attribute name="font-desc" value="Cantarell 10"/>
                       <attribute name="weight" value="bold"/>
diff --git a/pyanaconda/ui/gui/spokes/storage.glade b/pyanaconda/ui/gui/spokes/storage.glade
index e59beaf..eb74a72 100644
--- a/pyanaconda/ui/gui/spokes/storage.glade
+++ b/pyanaconda/ui/gui/spokes/storage.glade
@@ -867,7 +867,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">LOCAL STANDARD DISKS</property>
+                    <property name="label" translatable="yes">Local Standard Disks</property>
                     <property name="track_visited_links">False</property>
                     <attributes>
                       <attribute name="font-desc" value="Cantarell Bold 10"/>
@@ -932,7 +932,7 @@
             <property name="column_spacing">6</property>
             <child>
               <object class="GtkButton" id="continue_button">
-                <property name="label" translatable="yes">_CONTINUE</property>
+                <property name="label" translatable="yes">_Continue</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/widgets/src/StandaloneWindow.c b/widgets/src/StandaloneWindow.c
index c319e20..e87e5da 100644
--- a/widgets/src/StandaloneWindow.c
+++ b/widgets/src/StandaloneWindow.c
@@ -49,8 +49,8 @@ enum {
     LAST_SIGNAL
 };
 
-#define QUIT_TEXT       N_("_QUIT")
-#define CONTINUE_TEXT   N_("_CONTINUE")
+#define QUIT_TEXT       N_("_Quit")
+#define CONTINUE_TEXT   N_("_Continue")
 
 static guint window_signals[LAST_SIGNAL] = { 0 };
 
-- 
1.7.11.2



More information about the anaconda-patches mailing list