Assorted improvements of user-facing messages.

* src/guile/skribilo.scm,
  src/guile/skribilo/engine/info.scm,
  src/guile/skribilo/engine/lout.scm,
  src/guile/skribilo/index.scm,
  src/guile/skribilo/package/base.scm,
  src/guile/skribilo/sui.scm: Tweak messages for consistency, as
  suggested by Benno Schulenberg <coordinator@translationproject.org>.

6 files changed, 13 insertions, 12 deletions

diff --git a/src/guile/skribilo.scm b/src/guile/skribilo.scm
index f6156c9..0c45b92 100644
--- a/src/guile/skribilo.scm
+++ b/src/guile/skribilo.scm
@@ -71,7 +71,7 @@ the specified engine or the 'html' engine.
   (newline)
   (display (_ "\
   -R, --reader=READER    use READER to parse the input file;
-                           e.g., 'skribe' (default) or 'outline'\n"))
+                         e.g., 'skribe' (default) or 'outline'\n"))
   (display (_ "\
   -t, --target=ENGINE    use ENGINE as the output engine; e.g., 'html'\n"))
   (display (_ "\
@@ -79,7 +79,7 @@ the specified engine or the 'html' engine.
   (display (_ "\
   -o, --output=FILE      write output to FILE\n"))
   (display (_ "\
-      --compat=COMPAT    use COMPAT as the compatibility layer--e.g., 'skribe'\n"))
+      --compat=COMPAT    use COMPAT as the compatibility layer; e.g., 'skribe'\n"))
   (newline)
   (display (_ "\
   -I, --doc-path=DIR     prepend DIR to the document include path\n"))
diff --git a/src/guile/skribilo/engine/info.scm b/src/guile/skribilo/engine/info.scm
index 7cf2fad..ce448d9 100644
--- a/src/guile/skribilo/engine/info.scm
+++ b/src/guile/skribilo/engine/info.scm
@@ -1,7 +1,7 @@
 ;;; info.scm  --  GNU Info engine.
 ;;; -*- coding: iso-8859-1 -*-
 ;;;
-;;; Copyright 2008, 2009, 2012  Ludovic Courtès <ludo@gnu.org>
+;;; Copyright 2008, 2009, 2012, 2015  Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright 2001, 2002  Manuel Serrano
 ;;;
 ;;;
@@ -806,7 +806,7 @@
               (string? (markup-option n :file)))
   :action (lambda (n e)
             (if (markup-option n :url)
-                (skribe-warning/ast 1 n (_ "image URLs not supported"))
+                (skribe-warning/ast 1 n (_ "image URLs are not supported"))
                 (let ((f (let ((f (markup-option n :file)))
                            (convert-image f '("png" "gif" "jpg"))))
                       (h (markup-option n :height))
diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm
index cf5bd46..a059af1 100644
--- a/src/guile/skribilo/engine/lout.scm
+++ b/src/guile/skribilo/engine/lout.scm
@@ -2,7 +2,7 @@
 ;;; -*- coding: iso-8859-1 -*-
 ;;;
 ;;; Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-;;;  2012  Ludovic Courtès <ludo@gnu.org>
+;;;  2012, 2015  Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;;
 ;;; This file is part of Skribilo.
@@ -2422,7 +2422,7 @@
 						     '("eps"))))))
 		(cond (url ;; maybe we should run `wget' then?  :-)
                        (skribe-warning/ast 1 n
-                                           (_ "image URLs not supported")))
+                                           (_ "image URLs are not supported")))
 
                       ((string? img)
                        (if width
diff --git a/src/guile/skribilo/index.scm b/src/guile/skribilo/index.scm
index abdce19..50ef4f0 100644
--- a/src/guile/skribilo/index.scm
+++ b/src/guile/skribilo/index.scm
@@ -1,6 +1,6 @@
 ;;; index.scm -- Document indices.        -*- coding: iso-8859-1 -*-
 ;;;
-;;; Copyright 2005, 2006, 2008, 2009  Ludovic Courtès <ludo@gnu.org>
+;;; Copyright 2005, 2006, 2008, 2009, 2015  Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright 2003, 2004  Manuel Serrano
 ;;;
 ;;;
@@ -94,7 +94,7 @@
                                     (location-column loc))
                             ""))
                    (msg (format
-                         #f (_ "the-index: char-offset '~A' out of bounds~%")
+                         #f (_ "the-index: char offset '~A' out of bounds~%")
                          char-offset)))
                (raise (condition (&message
                                   (condition-message (string-append loc msg))))))
diff --git a/src/guile/skribilo/package/base.scm b/src/guile/skribilo/package/base.scm
index b6f9780..084493e 100644
--- a/src/guile/skribilo/package/base.scm
+++ b/src/guile/skribilo/package/base.scm
@@ -536,7 +536,7 @@
 	 ((and (not (null? body)) (or file start stop definition))
 	  (skribe-error 'source
 			(_ "file, start/stop, and definition\
- are exclusive with body")
+ cannot be combined with body")
 			body))
 	 ((and start stop definition)
 	  (skribe-error 'source
diff --git a/src/guile/skribilo/sui.scm b/src/guile/skribilo/sui.scm
index 8efda98..d4bf071 100644
--- a/src/guile/skribilo/sui.scm
+++ b/src/guile/skribilo/sui.scm
@@ -1,7 +1,8 @@
 ;;; sui.scm -- Skribe URL Indices
 ;;;
-;;; Copyright 2005, 2006, 2007, 2008, 2009, 2012  Ludovic Courtès <ludo@gnu.org>
-;;; Copyright 2003, 2004  Manuel Serrano
+;;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2012,
+;;;    2015  Ludovic Courtès <ludo@gnu.org>
+;;; Copyright (C) 2003, 2004  Manuel Serrano
 ;;;
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify
@@ -83,7 +84,7 @@
 
 	(else
 	 (format (current-error-port)
-                 (_ "undefined sui error: ~A~%")
+                 (_ "undefined SUI error: ~A~%")
 		 c))))
 
 (register-error-condition-handler! sui-error? handle-sui-error)