GNOME.org
 

[gnome-settings-daemon] Miscellaneous string fixes

commit dbbe27557ff7250eb75a8a2ad4f5a91b4ac0b6c3
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Apr 25 19:38:36 2010 +0100

    Miscellaneous string fixes
    
    Various small string fixes: mostly minor punctuation and capitalisation
    improvements, especially concerning XRandR. Two cases of markup in
    translatable strings have been removed, and a duplicate GConf key has been
    removed from a schema file. Helps: bgo#616785

 ...s_gnome_settings_daemon_housekeeping.schemas.in |    6 +++---
 ...ps_gnome_settings_daemon_keybindings.schemas.in |    2 +-
 data/apps_gnome_settings_daemon_xrandr.schemas.in  |   14 +++++++-------
 data/desktop_gnome_peripherals_touchpad.schemas.in |    2 +-
 data/gnome-settings-daemon.schemas.in              |   19 +++++--------------
 gnome-settings-daemon/main.c                       |    2 +-
 plugins/housekeeping/gsd-ldsm-dialog.c             |    2 +-
 plugins/housekeeping/gsd-ldsm-trash-empty.c        |    5 ++++-
 plugins/keyboard/gsd-keyboard-xkb.c                |    2 +-
 plugins/keyboard/modmap-dialog.ui                  |    2 +-
 plugins/mouse/gsd-mouse-manager.c                  |    2 +-
 plugins/xrandr/gsd-xrandr-manager.c                |    5 ++++-
 12 files changed, 30 insertions(+), 33 deletions(-)
---
diff --git a/data/apps_gnome_settings_daemon_housekeeping.schemas.in b/data/apps_gnome_settings_daemon_housekeeping.schemas.in
index 8f9697a..35dd118 100644
--- a/data/apps_gnome_settings_daemon_housekeeping.schemas.in
+++ b/data/apps_gnome_settings_daemon_housekeeping.schemas.in
@@ -9,7 +9,7 @@
 	    <locale name="C">
 	        <short>Free percentage notify threshold</short>
 		<long>Percentage free space threshold for initial warning of low disk space.
-				If the percentage free space drops below this, a warning will be shown</long>
+				If the percentage free space drops below this, a warning will be shown.</long>
 	    </locale>
 		</schema>
 		
@@ -20,7 +20,7 @@
 	    <default>0.01</default>
 	    <locale name="C">
 	        <short>Subsequent free percentage notify threshold</short>
-		<long>Specify the percentage that the free disk space should reduce by before issuing a subsequent warning</long>
+		<long>Specify the percentage that the free disk space should reduce by before issuing a subsequent warning.</long>
 	    </locale>
 		</schema>
 		
@@ -31,7 +31,7 @@
 	    <default>2</default>
 	    <locale name="C">
 	        <short>Free space no notify threshold</short>
-		<long>Specify an amount in GB. If the amount of free space is more than this, no warning will be shown</long>
+		<long>Specify an amount in GB. If the amount of free space is more than this, no warning will be shown.</long>
 	    </locale>
 		</schema>
 		
diff --git a/data/apps_gnome_settings_daemon_keybindings.schemas.in b/data/apps_gnome_settings_daemon_keybindings.schemas.in
index c5fe47f..a41fc28 100644
--- a/data/apps_gnome_settings_daemon_keybindings.schemas.in
+++ b/data/apps_gnome_settings_daemon_keybindings.schemas.in
@@ -79,7 +79,7 @@
             <default>XF86Eject</default>
             <locale name="C">
                 <short>Eject</short>
-                <long>Binding to eject an optical disk.</long>
+                <long>Binding to eject an optical disc.</long>
             </locale>
         </schema>
 
diff --git a/data/apps_gnome_settings_daemon_xrandr.schemas.in b/data/apps_gnome_settings_daemon_xrandr.schemas.in
index 48ea44d..d8442ae 100644
--- a/data/apps_gnome_settings_daemon_xrandr.schemas.in
+++ b/data/apps_gnome_settings_daemon_xrandr.schemas.in
@@ -9,7 +9,7 @@
             <default>false</default>
             <locale name="C">
 	        <short>Show Displays in Notification Area</short>
-                <long>If a notification icon with display related things should be
+                <long>Whether a notification icon with display-related things should be
 		    shown in the panel.
 		</long>
             </locale>
@@ -22,8 +22,8 @@
             <default>false</default>
             <locale name="C">
 	        <short>Turn on external monitor after system boot</short>
-                <long>Turn on external monitor after system boot if user plugin
-		external monitor when system boot.
+                <long>Turn on external monitor after system boot if user plugs in
+		external monitor on system boot.
 		</long>
             </locale>
         </schema>
@@ -35,8 +35,8 @@
             <default>true</default>
             <locale name="C">
 	        <short>Turn on laptop monitor after system boot</short>
-                <long>Turn on laptop monitor after system boot if user plugin
-		external monitor when system boot.
+                <long>Turn on laptop monitor after system boot if user plugs in
+		external monitor on system boot.
 		</long>
             </locale>
         </schema>
@@ -47,8 +47,8 @@
 	    <type>string</type>
             <default>/etc/gnome-settings-daemon/xrandr/monitors.xml</default>
             <locale name="C">
-	        <short>File for default configuration for RANDR</short>
-	        <long>The XRANDR plugin will look for a default
+	        <short>File for default configuration for RandR</short>
+	        <long>The XRandR plugin will look for a default
                 configuration in the file specified by this key.  This
                 is similar to the ~/.config/monitors.xml that normally
                 gets stored in users' home directories.  If a user
diff --git a/data/desktop_gnome_peripherals_touchpad.schemas.in b/data/desktop_gnome_peripherals_touchpad.schemas.in
index 78734e7..7d41073 100644
--- a/data/desktop_gnome_peripherals_touchpad.schemas.in
+++ b/data/desktop_gnome_peripherals_touchpad.schemas.in
@@ -34,7 +34,7 @@
       <default>1</default>
       <locale name="C">
         <short>Select the touchpad scroll method</short>
-        <long>Select the touchpad scroll method. Supported values are: 0 - disabled, 1 - edge scrolling, 2 - two-finger scrolling</long>
+        <long>Select the touchpad scroll method. Supported values are: 0: disabled, 1: edge scrolling, and 2: two-finger scrolling</long>
       </locale>
     </schema>
 
diff --git a/data/gnome-settings-daemon.schemas.in b/data/gnome-settings-daemon.schemas.in
index 9010355..79598a9 100644
--- a/data/gnome-settings-daemon.schemas.in
+++ b/data/gnome-settings-daemon.schemas.in
@@ -208,6 +208,7 @@
         <long></long>
       </locale>
     </schema>
+
     <schema>
       <key>/schemas/apps/gnome_settings_daemon/plugins/smartcard/active</key>
       <applyto>/apps/gnome_settings_daemon/plugins/smartcard/active</applyto>
@@ -216,18 +217,7 @@
       <default>TRUE</default>
       <locale name="C">
         <short>Enable smartcard plugin</short>
-        <long>Set to True to enable the plugin to manage locking screen on smartcard removal.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/gnome_settings_daemon/plugins/smartcard/active</key>
-      <applyto>/apps/gnome_settings_daemon/plugins/smartcard/active</applyto>
-      <owner>gnome-settings-daemon</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Enable smartcard plugin</short>
-        <long>Set to True to enable the plugin to manage locking screen on smartcard removal.</long>
+        <long>Set to True to enable the plugin to manage locking the screen on smartcard removal.</long>
       </locale>
     </schema>
     <schema>
@@ -241,6 +231,7 @@
         <long></long>
       </locale>
     </schema>
+
     <schema>
       <key>/schemas/apps/gnome_settings_daemon/plugins/sound/active</key>
       <applyto>/apps/gnome_settings_daemon/plugins/sound/active</applyto>
@@ -294,8 +285,8 @@
       <type>bool</type>
       <default>TRUE</default>
       <locale name="C">
-        <short>Enable xrandr plugin</short>
-        <long>Set to True to enable the plugin to manage xrandr settings.</long>
+        <short>Enable XRandR plugin</short>
+        <long>Set to True to enable the plugin to manage XRandR settings.</long>
       </locale>
     </schema>
     <schema>
diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c
index 05d081b..3ef971f 100644
--- a/gnome-settings-daemon/main.c
+++ b/gnome-settings-daemon/main.c
@@ -55,7 +55,7 @@ static GOptionEntry entries[] = {
         {"debug", 0, 0, G_OPTION_ARG_NONE, &debug, N_("Enable debugging code"), NULL },
         {"no-daemon", 0, 0, G_OPTION_ARG_NONE, &no_daemon, N_("Don't become a daemon"), NULL },
         {"gconf-prefix", 0, 0, G_OPTION_ARG_STRING, &gconf_prefix, N_("GConf prefix from which to load plugin settings"), NULL},
-        { "timed-exit", 0, 0, G_OPTION_ARG_NONE, &do_timed_exit, N_("Exit after a time - for debugging"), NULL },
+        { "timed-exit", 0, 0, G_OPTION_ARG_NONE, &do_timed_exit, N_("Exit after a time (for debugging)"), NULL },
         {NULL}
 };
 
diff --git a/plugins/housekeeping/gsd-ldsm-dialog.c b/plugins/housekeeping/gsd-ldsm-dialog.c
index b0e40ad..1c863ae 100644
--- a/plugins/housekeeping/gsd-ldsm-dialog.c
+++ b/plugins/housekeeping/gsd-ldsm-dialog.c
@@ -61,7 +61,7 @@ gsd_ldsm_dialog_get_checkbutton_text (GsdLdsmDialog *dialog)
         g_return_val_if_fail (GSD_IS_LDSM_DIALOG (dialog), NULL);
         
         if (dialog->priv->other_partitions)
-                return _("Don't show any warnings again for this filesystem");
+                return _("Don't show any warnings again for this file system");
         else
                 return _("Don't show any warnings again");
 }
diff --git a/plugins/housekeeping/gsd-ldsm-trash-empty.c b/plugins/housekeeping/gsd-ldsm-trash-empty.c
index c875f15..c538849 100644
--- a/plugins/housekeeping/gsd-ldsm-trash-empty.c
+++ b/plugins/housekeeping/gsd-ldsm-trash-empty.c
@@ -91,6 +91,7 @@ trash_empty_update_dialog (gpointer user_data)
         } else {
                 gchar *text;
                 gchar *tmp;
+                gchar *markup;
                 GFile *parent;
 
                 text = g_strdup_printf (_("Removing item %lu of %lu"),
@@ -113,8 +114,10 @@ trash_empty_update_dialog (gpointer user_data)
                 g_free (text);
 
                 tmp = g_file_get_basename (file);
-                text = g_markup_printf_escaped (_("<i>Removing: %s</i>"), tmp);
+                text = g_markup_printf_escaped (_("Removing: %s"), tmp);
+                markup = g_strdup_printf ("<i>%s</i>", text);
                 gtk_label_set_markup (GTK_LABEL (file_label), text);
+                g_free (markup);
                 g_free (text);
                 g_free (tmp);
 
diff --git a/plugins/keyboard/gsd-keyboard-xkb.c b/plugins/keyboard/gsd-keyboard-xkb.c
index 7618375..e2b8046 100644
--- a/plugins/keyboard/gsd-keyboard-xkb.c
+++ b/plugins/keyboard/gsd-keyboard-xkb.c
@@ -150,7 +150,7 @@ activation_error (void)
 						     _
 						     ("You are using XFree 4.3.0.\n"
 						      "There are known problems with complex XKB configurations.\n"
-						      "Try using a simpler configuration or taking a fresher version of XFree software.")
+						      "Try using a simpler configuration or using a later version of the XFree software.")
 						     : "",
 						     "xprop -root | grep XKB",
 						     "gconftool-2 -R /desktop/gnome/peripherals/keyboard/kbd");
diff --git a/plugins/keyboard/modmap-dialog.ui b/plugins/keyboard/modmap-dialog.ui
index b5b319a..12c34a6 100644
--- a/plugins/keyboard/modmap-dialog.ui
+++ b/plugins/keyboard/modmap-dialog.ui
@@ -15,7 +15,7 @@
             <child>
               <object class="GtkLabel" id="label62">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Would you like to load the modmap file(s)?</property>
+                <property name="label" translatable="yes">Would you like to load the modmap files?</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index 6d26c4f..6e76607 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -881,7 +881,7 @@ set_mousetweaks_daemon (GsdMouseManager *manager,
                                                          GTK_BUTTONS_OK,
                                                          _("Could not enable mouse accessibility features"));
                         gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                                  _("Mouse accessibility requires mousetweaks "
+                                                                  _("Mouse accessibility requires Mousetweaks "
                                                                     "to be installed on your system."));
                         gtk_window_set_title (GTK_WINDOW (dialog),
                                               _("Mouse Preferences"));
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index c2349dd..2777d9c 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -1677,11 +1677,14 @@ add_unsupported_rotation_item (GsdXrandrManager *manager)
         struct GsdXrandrManagerPrivate *priv = manager->priv;
         GtkWidget *item;
         GtkWidget *label;
+        gchar *markup;
 
         item = gtk_menu_item_new ();
 
         label = gtk_label_new (NULL);
-        gtk_label_set_markup (GTK_LABEL (label), _("<i>Rotation not supported</i>"));
+        markup = g_strdup_printf ("<i>%s</i>", _("Rotation not supported"));
+        gtk_label_set_markup (GTK_LABEL (label), markup);
+        g_free (markup);
         gtk_container_add (GTK_CONTAINER (item), label);
 
         gtk_widget_show_all (item);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]