GNOME.org
 

[gnome-terminal] all: Use nice quotes

commit 789ef639964320eb67bc110f28c0569e71563add
Author: Piotr Drąg <piotrdrag gmail com>
Date:   Wed Nov 16 16:03:14 2016 +0100

    all: Use nice quotes
    
    See https://developer.gnome.org/hig/stable/typography.html

 src/gterminal.vala                 |   16 ++++++++--------
 src/org.gnome.Terminal.gschema.xml |   30 +++++++++++++++---------------
 src/terminal-options.c             |   22 +++++++++++-----------
 src/terminal-window.c              |    4 ++--
 4 files changed, 36 insertions(+), 36 deletions(-)
---
diff --git a/src/gterminal.vala b/src/gterminal.vala
index 7de6e07..d59b9bf 100644
--- a/src/gterminal.vala
+++ b/src/gterminal.vala
@@ -82,7 +82,7 @@ namespace GTerminal
                                        void *unused_user_data) throws OptionError
     {
       if (!GLib.Application.id_is_valid (value))
-        throw new OptionError.BAD_VALUE (_("\"%s\" is not a valid application ID"), value);
+        throw new OptionError.BAD_VALUE (_("“%s” is not a valid application ID"), value);
       app_id = value;
       return true;
     }
@@ -146,7 +146,7 @@ namespace GTerminal
         int64 v;
         if (!int64.try_parse (pass_fds[i], out v) ||
             v == -1 || v < int.MIN || v > int.MAX)
-          throw new OptionError.BAD_VALUE (_("Invalid argument \"%s\" to --fd option"), pass_fds[i]);
+          throw new OptionError.BAD_VALUE (_("Invalid argument “%s” to --fd option"), pass_fds[i]);
 
         int fd = (int) v;
 
@@ -261,11 +261,11 @@ namespace GTerminal
     {
       double v;
       if (!double.try_parse (value, out v))
-        throw new OptionError.BAD_VALUE (_("\"%s\" is not a valid zoom factor"),
+        throw new OptionError.BAD_VALUE (_("“%s” is not a valid zoom factor"),
                                          value);
 
       if (v < 0.25 || v > 4.0)
-        throw new OptionError.BAD_VALUE (_("Zoom value \"%s\" is outside allowed range"),
+        throw new OptionError.BAD_VALUE (_("Zoom value “%s” is outside allowed range"),
                                          value);
 
       zoom = v;
@@ -279,7 +279,7 @@ namespace GTerminal
       { "cwd", 0, 0, OptionArg.FILENAME, ref working_directory,
         N_("Set the working directory"), N_("DIRNAME") },
       { "zoom", 0, 0, OptionArg.CALLBACK, (void*) option_zoom,
-        N_("Set the terminal's zoom factor (1.0 = normal size)"),
+        N_("Set the terminal’s zoom factor (1.0 = normal size)"),
         N_("ZOOM") },
       { null, 0, 0, 0, null, null, null }
     };
@@ -496,7 +496,7 @@ namespace GTerminal
           Output.print ("%s\n", commands[i].verb);
       }
     } else {
-      throw new OptionError.FAILED (_("Unknown command \"%s\""), argv[0]);
+      throw new OptionError.FAILED (_("Unknown command “%s”"), argv[0]);
     }
 
     return Posix.EXIT_SUCCESS;
@@ -523,10 +523,10 @@ namespace GTerminal
     OpenOptions.parse_argv (argv);
 
     if (argv[0] == "run" && OpenOptions.argv_post == null)
-      throw new OptionError.BAD_VALUE (_("'%s' needs the command to run as arguments after '--'"),
+      throw new OptionError.BAD_VALUE (_("“%s” needs the command to run as arguments after “--”"),
                                        argv[0]);
     else if (argv[0] == "shell" && OpenOptions.argv_post != null)
-      throw new OptionError.BAD_VALUE (_("Extraneous arguments after '--'"));
+      throw new OptionError.BAD_VALUE (_("Extraneous arguments after “--”"));
 
     var builder = new GLib.VariantBuilder (VariantType.TUPLE);
     builder.open (VariantType.VARDICT); {
diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
index c031c8a..c68512b 100644
--- a/src/org.gnome.Terminal.gschema.xml
+++ b/src/org.gnome.Terminal.gschema.xml
@@ -120,17 +120,17 @@
     <key name="foreground-color" type="s">
       <default>'#00FF00'</default>
       <summary>Default color of text in the terminal</summary>
-      <description>Default color of text in the terminal, as a color specification (can be HTML-style hex 
digits, or a color name such as "red").</description>
+      <description>Default color of text in the terminal, as a color specification (can be HTML-style hex 
digits, or a color name such as “red”).</description>
     </key>
     <key name="background-color" type="s">
       <default>'#000000'</default>
       <summary>Default color of terminal background</summary>
-      <description>Default color of terminal background, as a color specification (can be HTML-style hex 
digits, or a color name such as "red").</description>
+      <description>Default color of terminal background, as a color specification (can be HTML-style hex 
digits, or a color name such as “red”).</description>
     </key>
     <key name="bold-color" type="s">
       <default>'#000000'</default>
       <summary>Default color of bold text in the terminal</summary>
-      <description>Default color of bold text in the terminal, as a color specification (can be HTML-style 
hex digits, or a color name such as "red"). This is ignored if bold-color-same-as-fg is true.</description>
+      <description>Default color of bold text in the terminal, as a color specification (can be HTML-style 
hex digits, or a color name such as “red”). This is ignored if bold-color-same-as-fg is true.</description>
     </key>
     <key name="bold-color-same-as-fg" type="b">
       <default>true</default>
@@ -145,12 +145,12 @@
     <key name="cursor-background-color" type="s">
       <default>'#000000'</default>
       <summary>Cursor background color</summary>
-      <description>Custom color of the background of the terminal's cursor, as a color specification (can be 
HTML-style hex digits, or a color name such as "red"). This is ignored if cursor-colors-set is 
false.</description>
+      <description>Custom color of the background of the terminal’s cursor, as a color specification (can be 
HTML-style hex digits, or a color name such as “red”). This is ignored if cursor-colors-set is 
false.</description>
     </key>
     <key name="cursor-foreground-color" type="s">
       <default>'#ffffff'</default>
       <summary>Cursor foreground colour</summary>
-      <description>Custom color for the foreground of the text character at the terminal's cursor position, 
as a color specification (can be HTML-style hex digits, or a color name such as "red"). This is ignored if 
cursor-colors-set is false.</description>
+      <description>Custom color for the foreground of the text character at the terminal’s cursor position, 
as a color specification (can be HTML-style hex digits, or a color name such as “red”). This is ignored if 
cursor-colors-set is false.</description>
     </key>
     <key name="highlight-colors-set" type="b">
       <default>false</default>
@@ -160,12 +160,12 @@
     <key name="highlight-background-color" type="s">
       <default>'#000000'</default>
       <summary>Highlight background color</summary>
-      <description>Custom color of the background of the terminal's highlight, as a color specification (can 
be HTML-style hex digits, or a color name such as "red"). This is ignored if highlight-colors-set is 
false.</description>
+      <description>Custom color of the background of the terminal’s highlight, as a color specification (can 
be HTML-style hex digits, or a color name such as “red”). This is ignored if highlight-colors-set is 
false.</description>
     </key>
     <key name="highlight-foreground-color" type="s">
       <default>'#ffffff'</default>
       <summary>Highlight foreground colour</summary>
-      <description>Custom color for the foreground of the text character at the terminal's highlight 
position, as a color specification (can be HTML-style hex digits, or a color name such as "red"). This is 
ignored if highlight-colors-set is false.</description>
+      <description>Custom color for the foreground of the text character at the terminal’s highlight 
position, as a color specification (can be HTML-style hex digits, or a color name such as “red”). This is 
ignored if highlight-colors-set is false.</description>
     </key>
     <key name="allow-bold" type="b">
       <default>true</default>
@@ -204,7 +204,7 @@
     <key name="scrollback-lines" type="i">
       <default>10000</default>
       <summary>Number of lines to keep in scrollback</summary>
-      <description>Number of scrollback lines to keep around. You can scroll back in the terminal by this 
number of lines; lines that don't fit in the scrollback are discarded. If scrollback_unlimited is true, this 
value is ignored.</description>
+      <description>Number of scrollback lines to keep around. You can scroll back in the terminal by this 
number of lines; lines that don’t fit in the scrollback are discarded. If scrollback_unlimited is true, this 
value is ignored.</description>
     </key>
     <key name="scrollback-unlimited" type="b">
       <default>false</default>
@@ -218,13 +218,13 @@
     </key>
     <key name="scroll-on-output" type="b">
       <default>false</default>
-      <summary>Whether to scroll to the bottom when there's new output</summary>
-      <description>If true, whenever there's new output the terminal will scroll to the bottom.</description>
+      <summary>Whether to scroll to the bottom when there’s new output</summary>
+      <description>If true, whenever there’s new output the terminal will scroll to the bottom.</description>
     </key>
     <key name="exit-action" enum="org.gnome.Terminal.ExitAction">
       <default>'close'</default>
       <summary>What to do with the terminal when the child command exits</summary>
-      <description>Possible values are "close" to close the terminal, "restart" to restart the command, and 
"hold" to keep the terminal open with no command running inside.</description>
+      <description>Possible values are “close” to close the terminal, “restart” to restart the command, and 
“hold” to keep the terminal open with no command running inside.</description>
     </key>
     <key name="login-shell" type="b">
       <default>false</default>
@@ -239,7 +239,7 @@
     <key name="cursor-blink-mode" enum="org.gnome.Terminal.Cursor.BlinkMode">
       <default>'system'</default>
       <summary>Whether to blink the cursor</summary>
-      <description>The possible values are "system" to use the global cursor blinking settings, or "on" or 
"off" to set the mode explicitly.</description>
+      <description>The possible values are “system” to use the global cursor blinking settings, or “on” or 
“off” to set the mode explicitly.</description>
     </key>
     <key name="cursor-shape" enum="org.gnome.Terminal.Cursor.Shape">
       <default>'block'</default>
@@ -417,7 +417,7 @@
     </key>
     <key name="profile-preferences" type="s">
       <default>'disabled'</default>
-      <summary>Keyboard shortcut to open the current profile's Preferences dialog</summary>
+      <summary>Keyboard shortcut to open the current profile’s Preferences dialog</summary>
     </key>
     <key name="full-screen" type="s">
       <default>'F11'</default>
@@ -643,7 +643,7 @@
       <description>
         Whether to have Alt+letter access keys for the menubar.
         They may interfere with some applications run inside the terminal
-        so it's possible to turn them off.
+        so it’s possible to turn them off.
       </description>
     </key>
 
@@ -653,7 +653,7 @@
       <description>
         Whether shortcuts are enabled.
         They may interfere with some applications run inside the terminal
-        so it's possible to turn them off.
+        so it’s possible to turn them off.
       </description>
     </key>
 
diff --git a/src/terminal-options.c b/src/terminal-options.c
index 72181ee..360b890 100644
--- a/src/terminal-options.c
+++ b/src/terminal-options.c
@@ -219,7 +219,7 @@ add_new_window (TerminalOptions *options,
 static void
 deprecated_option_warning (const gchar *option_name)
 {
-  g_printerr (_("Option \"%s\" is deprecated and might be removed in a later version of gnome-terminal."),
+  g_printerr (_("Option “%s” is deprecated and might be removed in a later version of gnome-terminal."),
               option_name);
   g_printerr ("\n");
 }
@@ -230,7 +230,7 @@ unsupported_option_callback (const gchar *option_name,
                              gpointer     data,
                              GError     **error)
 {
-  g_printerr (_("Option \"%s\" is no longer supported in this version of gnome-terminal."),
+  g_printerr (_("Option “%s” is no longer supported in this version of gnome-terminal."),
               option_name);
   g_printerr ("\n");
   return TRUE; /* we do not want to bail out here but continue */
@@ -243,7 +243,7 @@ unsupported_option_fatal_callback (const gchar *option_name,
                                    GError     **error)
 {
   g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_UNKNOWN_OPTION,
-               _("Option \"%s\" is no longer supported in this version of gnome-terminal."),
+               _("Option “%s” is no longer supported in this version of gnome-terminal."),
                option_name);
   return FALSE;
 }
@@ -300,7 +300,7 @@ option_command_callback (const gchar *option_name,
       g_set_error(error,
                   G_OPTION_ERROR,
                   G_OPTION_ERROR_BAD_VALUE,
-                  _("Argument to \"%s\" is not a valid command: %s"),
+                  _("Argument to “%s” is not a valid command: %s"),
                    "--command/-e",
                   err->message);
       g_error_free (err);
@@ -489,7 +489,7 @@ option_show_menubar_callback (const gchar *option_name,
       iw = g_list_last (options->initial_windows)->data;
       if (iw->force_menubar_state && iw->menubar_state == TRUE)
         {
-          g_printerr (_("\"%s\" option given twice for the same window\n"),
+          g_printerr (_("“%s” option given twice for the same window\n"),
                         "--show-menubar");
 
           return TRUE;
@@ -522,7 +522,7 @@ option_hide_menubar_callback (const gchar *option_name,
 
       if (iw->force_menubar_state && iw->menubar_state == FALSE)
         {
-          g_printerr (_("\"%s\" option given twice for the same window\n"),
+          g_printerr (_("“%s” option given twice for the same window\n"),
                         "--hide-menubar");
           return TRUE;
         }
@@ -715,14 +715,14 @@ option_zoom_callback (const gchar *option_name,
       g_set_error (error,
                    G_OPTION_ERROR,
                    G_OPTION_ERROR_BAD_VALUE,
-                   _("\"%s\" is not a valid zoom factor"),
+                   _("“%s” is not a valid zoom factor"),
                    value);
       return FALSE;
     }
 
   if (zoom < (TERMINAL_SCALE_MINIMUM + 1e-6))
     {
-      g_printerr (_("Zoom factor \"%g\" is too small, using %g\n"),
+      g_printerr (_("Zoom factor “%g” is too small, using %g\n"),
                   zoom,
                   TERMINAL_SCALE_MINIMUM);
       zoom = TERMINAL_SCALE_MINIMUM;
@@ -730,7 +730,7 @@ option_zoom_callback (const gchar *option_name,
 
   if (zoom > (TERMINAL_SCALE_MAXIMUM - 1e-6))
     {
-      g_printerr (_("Zoom factor \"%g\" is too large, using %g\n"),
+      g_printerr (_("Zoom factor “%g” is too large, using %g\n"),
                   zoom,
                   TERMINAL_SCALE_MAXIMUM);
       zoom = TERMINAL_SCALE_MAXIMUM;
@@ -768,7 +768,7 @@ digest_options_callback (GOptionContext *context,
           g_set_error (error,
                        G_OPTION_ERROR,
                        G_OPTION_ERROR_BAD_VALUE,
-                       _("Option \"%s\" requires specifying the command to run"
+                       _("Option “%s” requires specifying the command to run"
                          " on the rest of the command line"),
                        "--execute/-x");
           return FALSE;
@@ -1219,7 +1219,7 @@ get_goption_context (TerminalOptions *options)
       0,
       G_OPTION_ARG_CALLBACK,
       option_zoom_callback,
-      N_("Set the terminal's zoom factor (1.0 = normal size)"),
+      N_("Set the terminal’s zoom factor (1.0 = normal size)"),
       N_("ZOOM")
     },
     { NULL, 0, 0, 0, NULL, NULL, NULL }
diff --git a/src/terminal-window.c b/src/terminal-window.c
index a290d9f..2921c02 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -2510,10 +2510,10 @@ terminal_window_init (TerminalWindow *window)
        NULL,
        G_CALLBACK (search_clear_highlight_callback) },
 #if 0
-      { "SearchGoToLine", "go-jump", N_("Go to _Line..."), "<shift><control>I",
+      { "SearchGoToLine", "go-jump", N_("Go to _Line…"), "<shift><control>I",
        NULL,
        G_CALLBACK (search_goto_line_callback) },
-      { "SearchIncrementalSearch", "edit-find", N_("_Incremental Search..."), "<shift><control>K",
+      { "SearchIncrementalSearch", "edit-find", N_("_Incremental Search…"), "<shift><control>K",
        NULL,
        G_CALLBACK (search_incremental_search_callback) },
 #endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]