[devhelp] Bug 593566 — Miscellaneous string fixes

[Philip Withnall <pwithnall src gnome org>]

commit cb14480d33dd5c1b033144960e181fea6817635b
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sat Oct 10 10:16:09 2009 +0100

    Bug 593566 â?? Miscellaneous string fixes

 data/devhelp.schemas.in |    6 +++---
 src/dh-assistant.c      |    2 +-
 src/dh-parser.c         |   10 +++++-----
 src/dh-window.c         |    6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/data/devhelp.schemas.in b/data/devhelp.schemas.in
index 3767b01..21e40eb 100644
--- a/data/devhelp.schemas.in
+++ b/data/devhelp.schemas.in
@@ -9,7 +9,7 @@
       <default>false</default>
       <locale name="C">
          <short>Main window maximized state</short>
-         <long>Whether the main window should start maximized or not.</long>
+         <long>Whether the main window should start maximized.</long>
       </locale>
     </schema>
 
@@ -122,8 +122,8 @@
       <type>string</type>
       <default>content</default>
       <locale name="C">
-         <short>Selected tab, "content" or "search"</short>
-         <long>Which of the tabs that is selected, "content" or "search".</long>
+         <short>Selected tab: "content" or "search"</short>
+         <long>Which of the tabs is selected: "content" or "search".</long>
       </locale>
     </schema>
     <schema>
diff --git a/src/dh-assistant.c b/src/dh-assistant.c
index a311a27..bd19d88 100644
--- a/src/dh-assistant.c
+++ b/src/dh-assistant.c
@@ -71,7 +71,7 @@ dh_assistant_init (DhAssistant *assistant)
         gtk_container_add (GTK_CONTAINER (assistant), priv->main_box);
 
         /* i18n: Please don't translate "Devhelp". */
-        gtk_window_set_title (GTK_WINDOW (assistant), _("Devhelp - Assistant"));
+        gtk_window_set_title (GTK_WINDOW (assistant), _("Devhelp â?? Assistant"));
         gtk_window_set_icon_name (GTK_WINDOW (assistant), "devhelp");
 
         priv->view = dh_assistant_view_new ();
diff --git a/src/dh-parser.c b/src/dh-parser.c
index 99f95d9..94fc135 100644
--- a/src/dh-parser.c
+++ b/src/dh-parser.c
@@ -89,7 +89,7 @@ parser_start_node_book (DhParser             *parser,
                 g_set_error (error,
                              DH_ERROR,
                              DH_ERROR_MALFORMED_BOOK,
-                             _("Expected '%s' got '%s' at line %d, column %d"),
+                             _("Expected '%s', got '%s' at line %d, column %d"),
                              "book", node_name, line, col);
                 return;
         }
@@ -137,7 +137,7 @@ parser_start_node_book (DhParser             *parser,
                 g_set_error (error,
                              DH_ERROR,
                              DH_ERROR_MALFORMED_BOOK,
-                             _("\"title\", \"name\", and \"link\" elements are "
+                             _("\"title\", \"name\" and \"link\" elements are "
                                "required at line %d, column %d"),
                              line, col);
                 g_free (title);
@@ -186,7 +186,7 @@ parser_start_node_chapter (DhParser             *parser,
                 g_set_error (error,
                              DH_ERROR,
                              DH_ERROR_MALFORMED_BOOK,
-                             _("Expected '%s' got '%s' at line %d, column %d"),
+                             _("Expected '%s', got '%s' at line %d, column %d"),
                              "sub", node_name, line, col);
                 return;
         }
@@ -250,7 +250,7 @@ parser_start_node_keyword (DhParser             *parser,
                 g_set_error (error,
                              DH_ERROR,
                              DH_ERROR_MALFORMED_BOOK,
-                             _("Expected '%s' got '%s' at line %d, column %d"),
+                             _("Expected '%s', got '%s' at line %d, column %d"),
                              "keyword", node_name, line, col);
                 return;
         }
@@ -260,7 +260,7 @@ parser_start_node_keyword (DhParser             *parser,
                 g_set_error (error,
                              DH_ERROR,
                              DH_ERROR_MALFORMED_BOOK,
-                             _("Expected '%s' got '%s' at line %d, column %d"),
+                             _("Expected '%s', got '%s' at line %d, column %d"),
                              "function", node_name, line, col);
                 return;
         }
diff --git a/src/dh-window.c b/src/dh-window.c
index 0e55717..303e357 100644
--- a/src/dh-window.c
+++ b/src/dh-window.c
@@ -735,7 +735,7 @@ window_activate_about (GtkAction *action,
         gtk_show_about_dialog (GTK_WINDOW (window),
                                "name", _("Devhelp"),
                                "version", PACKAGE_VERSION,
-                               "comments", _("A developer's help browser for GNOME"),
+                               "comments", _("A developers' help browser for GNOME"),
                                "authors", authors,
                                "documenters", documenters,
                                "translator-credits",
@@ -776,7 +776,7 @@ static const GtkActionEntry actions[] = {
           G_CALLBACK (window_activate_new_window) },
         { "NewTab", GTK_STOCK_NEW, N_("New _Tab"), "<control>T", NULL,
           G_CALLBACK (window_activate_new_tab) },
-        { "Print", GTK_STOCK_PRINT, N_("_Print..."), "<control>P", NULL,
+        { "Print", GTK_STOCK_PRINT, N_("_Printâ?¦"), "<control>P", NULL,
           G_CALLBACK (window_activate_print) },
         { "Close", GTK_STOCK_CLOSE, NULL, NULL, NULL,
           G_CALLBACK (window_activate_close) },
@@ -1107,7 +1107,7 @@ window_populate (DhWindow *window)
                 group =  ige_mac_menu_add_app_menu_group ();
                 widget = gtk_ui_manager_get_widget (priv->manager, "/MenuBar/EditMenu/Preferences");
                 ige_mac_menu_add_app_menu_item (group, GTK_MENU_ITEM (widget),
-                                                _("Preferences..."));
+                                                _("Preferencesâ?¦"));
 
                 ige_mac_menu_set_global_key_handler_enabled (TRUE);
         }