Consolidate translatable strings into a common form.

Be kind to the translators and reduce the number of
distinct strings they have to translate.

diff --git a/src/output/cairo.c b/src/output/cairo.c
index b8fc486e89e66e1fe218e9543e31eb43b4afe3d9..a2d5fef9d1ddfd36914ef6f3fa22e55fdcb48424 100644 (file)
--- a/src/output/cairo.c
+++ b/src/output/cairo.c
@@ -389,8 +389,8 @@ handle_option (void *options_, const char *key, const struct string *val)
     {
     case -1:
       error (0, 0,
-             _("unknown configuration parameter `%s' for Cairo device "
-               "driver"), key);
+             _("unknown configuration parameter `%s' for %s device "
+               "driver"), key, this->class->name);
       break;
     case output_file_arg:
       free (options->file_name);

diff --git a/src/output/odt.c b/src/output/odt.c
index 7c87a37090ca62a44ae21a4ae27ed58ef64f98ce..5c0bee8ea92b53efa28e160eeb7f568375096973 100644 (file)
--- a/src/output/odt.c
+++ b/src/output/odt.c
@@ -46,6 +46,8 @@
 
 struct odf_driver_options
 {
+  struct outp_driver *driver;
+  
   char *file_name;            /* Output file name. */
   bool debug;
 };
@@ -283,6 +285,7 @@ static bool
 handle_option (void *options_, const char *key, const struct string *val)
 {
   struct odf_driver_options *options = options_;
+  struct outp_driver *this = options->driver;
   int subcat;
   char *value = ds_cstr (val);
 
@@ -290,8 +293,8 @@ handle_option (void *options_, const char *key, const struct string *val)
     {
     case -1:
       error (0, 0,
-             _("unknown configuration parameter `%s' for ODF device "
-               "driver"), key);
+             _("unknown configuration parameter `%s' for %s device "
+               "driver"), key, this->class->name);
       break;
     case output_file_arg:
       free (options->file_name);
@@ -327,6 +330,7 @@ odt_open_driver (const char *name, int types, struct substring option_string)
 
   this->ext = x = xmalloc (sizeof *x);
 
+  x->opts.driver = this;
   x->opts.file_name = xstrdup ("pspp.pdt");
   x->opts.debug = false;