Added gettext markup to some strings which required it

diff --git a/po/en_GB.po b/po/en_GB.po
index 788ae186a2f4404c7cbb7a2809b09d39d271ea35..13bbde5c6ed3cda93e3e8a4300ec49e0e491cf13 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PSPP 0.7.5\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2010-10-03 13:10+0200\n"
+"POT-Creation-Date: 2010-10-03 14:00+0200\n"
 "PO-Revision-Date: 2010-09-15 08:17+0900\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: John Darrington <john@darrington.wattle.id.au>\n"
@@ -730,6 +730,11 @@ msgstr ""
 "Compression bias is not the usual value of 100, or system file uses \n"
 "unrecognised floating-point format."
 
+#: src/data/sys-file-reader.c:598
+#, c-format
+msgid "Variable name begins with invalid character `%c'."
+msgstr "Variable name begins with invalid character ‘%c’."
+
 #: src/data/sys-file-reader.c:601
 #, c-format
 msgid "Invalid variable name `%s'."
@@ -4672,6 +4677,11 @@ msgstr ""
 msgid "Custom"
 msgstr ""
 
+#: src/ui/gui/psppire-var-store.c:755
+#, c-format
+msgid "{%s,`%s'}_"
+msgstr "{%s,‘%s’}_"
+
 #: src/ui/gui/psppire-window.c:97
 #, c-format
 msgid "%s %s PSPPIRE %s"
@@ -4853,6 +4863,11 @@ msgstr ""
 msgid "Confidence Interval: %2d %%"
 msgstr ""
 
+#: src/ui/gui/val-labs-dialog.c:515
+#, c-format
+msgid "%s = `%s'"
+msgstr "%s = ‘%s’"
+
 #: src/ui/gui/variable-info-dialog.c:77
 #, c-format
 msgid "Label: %s\n"

diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c
index 36a2cb7a986f24208de96bfb0dc257cda64f21fc..c9c843dfaf4dd83cee88f7dd510284fa37e516a7 100644 (file)
--- a/src/data/sys-file-reader.c
+++ b/src/data/sys-file-reader.c
@@ -595,7 +595,7 @@ read_variable_record (struct sfm_reader *r, struct dictionary *dict,
 
   /* Check variable name. */
   if (name[0] == '$' || name[0] == '#')
-    sys_error (r, "Variable name begins with invalid character `%c'.",
+    sys_error (r, _("Variable name begins with invalid character `%c'."),
                name[0]);
   if (!var_is_plausible_name (name, false))
     sys_error (r, _("Invalid variable name `%s'."), name);

diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c
index ddfc802f576051277fa45226efc618636eb1dac1..a2e6685443e3dd5a525d5f985f8e7acb1f4dd709 100644 (file)
--- a/src/ui/gui/psppire-var-store.c
+++ b/src/ui/gui/psppire-var-store.c
@@ -752,7 +752,7 @@ text_for_column (PsppireVarStore *vs,
            {
              gchar *const vstr = value_to_text (vl->value, dict, *write_spec);
 
-             return g_strdup_printf ( "{%s,`%s'}_", vstr, val_lab_get_label (vl));
+             return g_strdup_printf (_("{%s,`%s'}_"), vstr, val_lab_get_label (vl));
            }
          }
       }

diff --git a/src/ui/gui/val-labs-dialog.c b/src/ui/gui/val-labs-dialog.c
index 68d7070ca13495a0e996f92b9ce0c812740bc3ce..efeb548e29d61060c5a781c1057716cff103fdab 100644 (file)
--- a/src/ui/gui/val-labs-dialog.c
+++ b/src/ui/gui/val-labs-dialog.c
@@ -30,6 +30,10 @@
 #include "psppire-var-store.h"
 #include <libpspp/i18n.h>
 
+#include <gettext.h>
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
 struct val_labs_dialog
 {
   GtkWidget *window;
@@ -508,7 +512,7 @@ repopulate_dialog (struct val_labs_dialog *dialog)
        value_to_text (vl->value, dialog->dict,
                      *var_get_write_format (dialog->pv));
 
-      gchar *const text = g_strdup_printf ("%s = `%s'",
+      gchar *const text = g_strdup_printf (_("%s = `%s'"),
                                           vstr, val_lab_get_label (vl));
 
       gtk_list_store_append (list_store, &iter);