[gnome-screensaver] Remove markup from translatable messages and add translator comments

[William Jon McCann <mccann src gnome org>]

commit afcacc0ff22c8ea3771f06087fd50f4562a70fb9
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Jun 21 17:44:31 2010 -0400

    Remove markup from translatable messages and add translator comments
    
    Remove markup from various translatable messages and add some translator
    comments where appropriate. I've marked one interface string (which was just
    a placeholder expanding to the user's full name) as non-translatable, and
    fixed a non-translatable string concatenation mess.
    
    http://bugzilla-attachments.gnome.org/attachment.cgi?id=154645

 data/gnome-screensaver-preferences.ui |   12 ++++++++----
 data/lock-dialog-default.ui           |   12 ++++++++----
 src/gnome-screensaver-command.c       |    2 +-
 src/gnome-screensaver-dialog.c        |    8 ++++++--
 4 files changed, 23 insertions(+), 11 deletions(-)
---
diff --git a/data/gnome-screensaver-preferences.ui b/data/gnome-screensaver-preferences.ui
index cfa6ccd..8218ed7 100644
--- a/data/gnome-screensaver-preferences.ui
+++ b/data/gnome-screensaver-preferences.ui
@@ -372,9 +372,8 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="root_warning_label">
-                                    <property name="label" translatable="yes">&lt;b&gt;Warning: the screen will not be locked for the root user.&lt;/b&gt;</property>
+                                    <property name="label" translatable="yes">Warning: the screen will not be locked for the root user.</property>
                                     <property name="use_underline">False</property>
-                                    <property name="use_markup">True</property>
                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
                                     <property name="wrap">True</property>
                                     <property name="selectable">False</property>
@@ -386,6 +385,9 @@
                                     <property name="width_chars">-1</property>
                                     <property name="single_line_mode">False</property>
                                     <property name="angle">0</property>
+                                    <attributes>
+                                      <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+                                    </attributes>
                                   </object>
                                   <packing>
                                     <property name="padding">0</property>
@@ -489,9 +491,8 @@
             <child>
               <object class="GtkLabel" id="label15">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;Screensaver preview&lt;/b&gt;</property>
+                <property name="label" translatable="yes">Screensaver preview</property>
                 <property name="use_underline">False</property>
-                <property name="use_markup">True</property>
                 <property name="justify">GTK_JUSTIFY_FILL</property>
                 <property name="wrap">True</property>
                 <property name="selectable">False</property>
@@ -503,6 +504,9 @@
                 <property name="width_chars">-1</property>
                 <property name="single_line_mode">False</property>
                 <property name="angle">0</property>
+                <attributes>
+                  <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+                </attributes>
               </object>
               <packing>
                 <property name="padding">0</property>
diff --git a/data/lock-dialog-default.ui b/data/lock-dialog-default.ui
index 2af8ce1..5c058fb 100644
--- a/data/lock-dialog-default.ui
+++ b/data/lock-dialog-default.ui
@@ -41,8 +41,10 @@
                             <child>
                               <object class="GtkLabel" id="auth-realname-label">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;span size="x-large"&gt;%R&lt;/span&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label">%R</property>
+                                <attributes>
+                                  <attribute name="scale" value="1.44"/><!-- PANGO_SCALE_X_LARGE -->
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -53,8 +55,10 @@
                             <child>
                               <object class="GtkLabel" id="auth-username-label">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;span size="small"&gt;%U on %h&lt;/span&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label">%U on %h</property>
+                                <attributes>
+                                  <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
+                                </attributes>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
diff --git a/src/gnome-screensaver-command.c b/src/gnome-screensaver-command.c
index 474858f..e94a7cb 100644
--- a/src/gnome-screensaver-command.c
+++ b/src/gnome-screensaver-command.c
@@ -292,7 +292,7 @@ do_command (DBusConnection *connection)
 
                 dbus_message_iter_init (reply, &iter);
                 dbus_message_iter_get_basic (&iter, &v);
-                g_print (_("The screensaver is %s\n"), v ? _("active") : _("inactive"));
+                g_print (v ? _("The screensaver is active\n") : _("The screensaver is inactive\n"));
 
                 dbus_message_unref (reply);
 
diff --git a/src/gnome-screensaver-dialog.c b/src/gnome-screensaver-dialog.c
index 09cde37..e9c0b41 100644
--- a/src/gnome-screensaver-dialog.c
+++ b/src/gnome-screensaver-dialog.c
@@ -64,9 +64,13 @@ static GOptionEntry entries [] = {
         { "enable-switch", 0, 0, G_OPTION_ARG_NONE, &enable_switch,
           N_("Show the switch user button"), NULL },
         { "status-message", 0, 0, G_OPTION_ARG_STRING, &status_message,
-          N_("Message to show in the dialog"), N_("MESSAGE") },
+          N_("Message to show in the dialog"),
+          /* Translators: This is the example input for the --status-message command line option. */
+          N_("MESSAGE") },
         { "away-message", 0, 0, G_OPTION_ARG_STRING, &away_message,
-          N_("Not used"), N_("MESSAGE") },
+          N_("Not used"),
+          /* Translators: This is the example input for the --away-message command line option. */
+          N_("MESSAGE") },
         { NULL }
 };