X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fdriver.c;h=acc58cf999cdd7b77d533f54edc9ce17db954550;hb=64ad089c50c954e9130448f1becfab0f6aff6a9b;hp=c0a525edae2f4963c3b34067c8c8f474b5b1a017;hpb=5d8fa2ae8c6e7d890570585aedec66bd51630814;p=pspp

diff --git a/src/output/driver.c b/src/output/driver.c
index c0a525edae..acc58cf999 100644
--- a/src/output/driver.c
+++ b/src/output/driver.c
@@ -235,7 +235,7 @@ extern const struct output_driver_factory txt_driver_factory;
 extern const struct output_driver_factory list_driver_factory;
 extern const struct output_driver_factory html_driver_factory;
 extern const struct output_driver_factory csv_driver_factory;
-#ifdef ODT_SUPPORT
+#ifdef ODF_WRITE_SUPPORT
 extern const struct output_driver_factory odt_driver_factory;
 #endif
 #ifdef HAVE_CAIRO
@@ -250,7 +250,7 @@ static const struct output_driver_factory *factories[] =
     &list_driver_factory,
     &html_driver_factory,
     &csv_driver_factory,
-#ifdef ODT_SUPPORT
+#ifdef ODF_WRITE_SUPPORT
     &odt_driver_factory,
 #endif
 #ifdef HAVE_CAIRO
@@ -315,9 +315,8 @@ output_driver_create (struct string_map *options)
     device_type = SETTINGS_DEVICE_LISTING;
   else
     {
-      /* TRANSLATORS: Don't translate the words `terminal' or `listing'. */
-      error (0, 0, _("%s is not a valid device type (the choices are "
-                     "`terminal' and `listing')"), device_string);
+      error (0, 0, _("%s is not a valid device type (the choices are `%s' and `%s')"),
+                     device_string, "terminal", "listing");
       device_type = default_device_type (file_name);
     }