Various small string fixes.

Mostly capitalisation fixes, but there are some spelling fixes, and
three strings which have had markup removed. One string has been
changed from using an ASCII ellipsis to a Unicode one.

Taken from GSM commit: f727cae54fc8410ecb3c2c4c4f901b754f418a7a
From: Philip Withnall <[email protected]>
Gnome bug: https://bugzilla.gnome.org/show_bug.cgi?id=616794

6 files changed, 28 insertions, 28 deletions

diff --git a/src/gsm_color_button.c b/src/gsm_color_button.c
index f484406..5244d3b 100644
--- a/src/gsm_color_button.c
+++ b/src/gsm_color_button.c
@@ -201,7 +201,7 @@ gsm_color_button_class_init (GSMColorButtonClass * klass)
                                      PROP_PERCENTAGE,
                                      g_param_spec_double ("fraction",
                                                           _("Fraction"),
-                                                          _("Percentage full for pie colour pickers"),
+                                                          _("Percentage full for pie color pickers"),
                                                           0, 1, 0.5,
                                                           G_PARAM_READWRITE));
 
diff --git a/src/interface.cpp b/src/interface.cpp
index 3234b9a..7b5b96f 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -68,7 +68,7 @@ static const GtkActionEntry menu_entries[] =
       N_("Force process to finish normally"), G_CALLBACK (cb_end_process) },
     { "KillProcess", NULL, N_("_Kill Process"), "<control>K",
       N_("Force process to finish immediately"), G_CALLBACK (cb_kill_process) },
-    { "ChangePriority", NULL, N_("_Change Priority..."), "<control>N",
+    { "ChangePriority", NULL, N_("_Change Priority…"), "<control>N",
       N_("Change the order of priority of process"), G_CALLBACK (cb_renice) },
     { "Preferences", GTK_STOCK_PREFERENCES, NULL, NULL,
       N_("Configure the application"), G_CALLBACK (cb_edit_preferences) },
diff --git a/src/load-graph.cpp b/src/load-graph.cpp
index 186a36a..15c132e 100644
--- a/src/load-graph.cpp
+++ b/src/load-graph.cpp
@@ -140,7 +140,7 @@ static void draw_background(LoadGraph *graph) {
             pango_cairo_show_layout (cr, layout);
         } else {
             // operation orders matters so it's 0 if i == num_bars
-            caption = g_strdup_printf("%d %%", 100 - i * (100 / num_bars));
+            caption = g_strdup_printf("%d%%", 100 - i * (100 / num_bars));
             pango_layout_set_text (layout, caption, -1);
             pango_layout_get_extents (layout, NULL, &extents);
             cairo_move_to (cr, graph->indent - 1.0 * extents.width / PANGO_SCALE + 20, y - 1.0 * extents.height / PANGO_SCALE / 2);
@@ -353,7 +353,7 @@ namespace
             text = g_strdup(_("not available"));
         } else {
             // xgettext: 540MiB (53 %) of 1.0 GiB
-            text = g_strdup_printf(_("%s (%.1f %%) of %s"), used_text, 100.0 * percent, total_text);
+            text = g_strdup_printf(_("%s (%.1f%%) of %s"), used_text, 100.0 * percent, total_text);
         }
         gtk_label_set_text(label, text);
         g_free(used_text);
diff --git a/src/org.mate.system-monitor.gschema.xml.in.in b/src/org.mate.system-monitor.gschema.xml.in.in
index 9b96b05..56e249f 100644
--- a/src/org.mate.system-monitor.gschema.xml.in.in
+++ b/src/org.mate.system-monitor.gschema.xml.in.in
@@ -16,7 +16,7 @@
     <key name="solaris-mode" type="b">
       <default>false</default>
       <_summary>Solaris mode for CPU percentage</_summary>
-      <_description>If TRUE, system-monitor operates in 'Solaris mode' where a task's cpu usage is divided by the total number of CPUs. Else it operates in 'Irix mode'.</_description>
+      <_description>If TRUE, system-monitor operates in 'Solaris mode' where a task's CPU usage is divided by the total number of CPUs. Otherwise, it operates in 'Irix mode'.</_description>
     </key>
     <key name="smooth-refresh" type="b">
       <default>true</default>
@@ -36,8 +36,8 @@
     </key>
     <key name="show-all-fs" type="b">
       <default>false</default>
-      <_summary>Whether information about all filesystems should be displayed</_summary>
-      <_description>Whether to display information about all filesystems (including types like 'autofs' and 'procfs'). Useful for getting a list of all currently mounted filesystems.</_description>
+      <_summary>Whether information about all file systems should be displayed</_summary>
+      <_description>Whether to display information about all file systems (including types like 'autofs' and 'procfs'). Useful for getting a list of all currently mounted file systems.</_description>
     </key>
     <key name="disks-interval" type="i">
       <default>5000</default>
@@ -54,27 +54,27 @@
     </key>
     <key name="cpu-color0" type="s">
       <default>'#FF6E00'</default>
-      <_summary>Default graph cpu color</_summary>
+      <_summary>Default graph CPU color</_summary>
     </key>
     <key name="cpu-color1" type="s">
       <default>'#CB0C29'</default>
-      <_summary>Default graph cpu color</_summary>
+      <_summary>Default graph CPU color</_summary>
     </key>
     <key name="cpu-color2" type="s">
       <default>'#49A835'</default>
-      <_summary>Default graph cpu color</_summary>
+      <_summary>Default graph CPU color</_summary>
     </key>
     <key name="cpu-color3" type="s">
       <default>'#2D7DB3'</default>
-      <_summary>Default graph cpu color</_summary>
+      <_summary>Default graph CPU color</_summary>
     </key>
     <key name="cpu-color4" type="s">
       <default>'#FF6600'</default>
-      <_summary>Default graph cpu color</_summary>
+      <_summary>Default graph CPU color</_summary>
     </key>
     <key name="cpu-color5" type="s">
       <default>'#6600CC'</default>
-      <_summary>Default graph cpu color</_summary>
+      <_summary>Default graph CPU color</_summary>
     </key>
     <key name="cpu-color6" type="s">
       <default>'#990000'</default>
@@ -82,43 +82,43 @@
     </key>
     <key name="cpu-color7" type="s">
       <default>'#000099'</default>
-      <_summary>Default graph cpu color</_summary>
+      <_summary>Default graph CPU color</_summary>
     </key>
     <key name="cpu-color8" type="s">
       <default>'#FFCC00'</default>
-      <_summary>Default graph cpu color</_summary>
+      <_summary>Default graph CPU color</_summary>
     </key>
     <key name="cpu-color9" type="s">
       <default>'#009900'</default>
-      <_summary>Default graph cpu color</_summary>
+      <_summary>Default graph CPU color</_summary>
     </key>
     <key name="cpu-color10" type="s">
       <default>'#CC6600'</default>
-      <_summary>Default graph cpu color</_summary>
+      <_summary>Default graph CPU color</_summary>
     </key>
     <key name="cpu-color11" type="s">
       <default>'#330099'</default>
-      <_summary>Default graph cpu color</_summary>
+      <_summary>Default graph CPU color</_summary>
     </key>
     <key name="cpu-color12" type="s">
       <default>'#CC0066'</default>
-      <_summary>Default graph cpu color</_summary>
+      <_summary>Default graph CPU color</_summary>
     </key>
     <key name="cpu-color13" type="s">
       <default>'#00FFCC'</default>
-      <_summary>Default graph cpu color</_summary>
+      <_summary>Default graph CPU color</_summary>
     </key>
     <key name="cpu-color14" type="s">
       <default>'#FFCC99'</default>
-      <_summary>Default graph cpu color</_summary>
+      <_summary>Default graph CPU color</_summary>
     </key>
     <key name="cpu-color15" type="s">
       <default>'#339999'</default>
-      <_summary>Default graph cpu color</_summary>
+      <_summary>Default graph CPU color</_summary>
     </key>
     <key name="mem-color" type="s">
       <default>'#AB1852'</default>
-      <_summary>Default graph mem color</_summary>
+      <_summary>Default graph memory color</_summary>
     </key>
     <key name="swap-color" type="s">
       <default>'#49A835'</default>
diff --git a/src/procactions.cpp b/src/procactions.cpp
index a01c150..a8f3d61 100644
--- a/src/procactions.cpp
+++ b/src/procactions.cpp
@@ -72,7 +72,7 @@ renice_single_process (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter
 
     /* failed */
     error_msg = g_strdup_printf (
-        _("Cannot change the priority of process with pid %d to %d.\n"
+        _("Cannot change the priority of process with PID %d to %d.\n"
           "%s"),
         info->pid, args->nice_value, g_strerror(saved_errno));
 
@@ -152,7 +152,7 @@ kill_single_process (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
 
     /* failed */
     error_msg = g_strdup_printf (
-        _("Cannot kill process with pid %d with signal %d.\n"
+        _("Cannot kill process with PID %d with signal %d.\n"
           "%s"),
         info->pid, args->signal, g_strerror(saved_errno));
 
diff --git a/src/procdialogs.cpp b/src/procdialogs.cpp
index d89295a..e44fd20 100644
--- a/src/procdialogs.cpp
+++ b/src/procdialogs.cpp
@@ -73,7 +73,7 @@ procdialog_create_kill_dialog (ProcData *procdata, int signal)
         /*xgettext: secondary alert message*/
         secondary = _("Killing a process may destroy data, break the "
                     "session or introduce a security risk. "
-                    "Only unresponding processes should be killed.");
+                    "Only unresponsive processes should be killed.");
         button_text = _("_Kill Process");
     }
     else {
@@ -84,7 +84,7 @@ procdialog_create_kill_dialog (ProcData *procdata, int signal)
         /*xgettext: secondary alert message*/
         secondary = _("Ending a process may destroy data, break the "
                     "session or introduce a security risk. "
-                    "Only unresponding processes should be ended.");
+                    "Only unresponsive processes should be ended.");
         button_text = _("_End Process");
     }
 
@@ -753,7 +753,7 @@ procdialog_create_preferences_dialog (ProcData *procdata)
 
     hbox2 = gtk_hbox_new (FALSE, 6);
     gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, FALSE, 0);
-    check_button = gtk_check_button_new_with_mnemonic (_("Show _all filesystems"));
+    check_button = gtk_check_button_new_with_mnemonic (_("Show _all file systems"));
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
                                   procdata->config.show_all_fs);
     g_signal_connect (G_OBJECT (check_button), "toggled",