; Merge from origin/emacs-25

[gnu-emacs] / lisp / gnus / legacy-gnus-agent.el

diff --git a/lisp/gnus/legacy-gnus-agent.el b/lisp/gnus/legacy-gnus-agent.el
index bd69087af09edfd5068f051ff4e99172e9ca2d1d..a8c61faecc000e39503c07a7da56a9b0b2df70ed 100644 (file)
--- a/lisp/gnus/legacy-gnus-agent.el
+++ b/lisp/gnus/legacy-gnus-agent.el
@@ -1,6 +1,6 @@
 ;;; gnus-agent.el --- Legacy unplugged support for Gnus
 
 ;;; gnus-agent.el --- Legacy unplugged support for Gnus
 

-;; Copyright (C) 2004-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2016 Free Software Foundation, Inc.

 
 ;; Author: Kevin Greiner <kgreiner@xpediantsolutions.com>
 ;; Keywords: news
 
 ;; Author: Kevin Greiner <kgreiner@xpediantsolutions.com>
 ;; Keywords: news


@@ -147,14 +147,19 @@ converted to the compressed format."
             (insert "The definition of gnus-agent-expire-days has been changed.\nYou currently have it set to the list:\n  ")
             (gnus-pp gnus-agent-expire-days)
 
             (insert "The definition of gnus-agent-expire-days has been changed.\nYou currently have it set to the list:\n  ")
             (gnus-pp gnus-agent-expire-days)
 

-            (insert "\nIn order to use version '" converting-to "' of gnus, you will need to set\n")
+           (insert
+            (format-message
+             "\nIn order to use version `%s' of gnus, you will need to set\n"
+             converting-to))

             (insert "gnus-agent-expire-days to an integer. If you still wish to set different\n")
             (insert "expiration days to individual groups, you must instead set the\n")
             (insert "gnus-agent-expire-days to an integer. If you still wish to set different\n")
             (insert "expiration days to individual groups, you must instead set the\n")

-            (insert "'agent-days-until-old group and/or topic parameter.\n")
+            (insert (format-message
+                    "`agent-days-until-old' group and/or topic parameter.\n"))

             (insert "\n")
             (insert "If you would like, gnus can iterate over every group comparing its name to the\n")
             (insert "regular expressions that you currently have in gnus-agent-expire-days.  When\n")
             (insert "\n")
             (insert "If you would like, gnus can iterate over every group comparing its name to the\n")
             (insert "regular expressions that you currently have in gnus-agent-expire-days.  When\n")

-            (insert "gnus finds a match, it will update that group's 'agent-days-until-old group\n")
+            (insert (format-message
+                    "gnus finds a match, it will update that group's `agent-days-until-old' group\n"))

             (insert "parameter to the value associated with the regular expression.\n")
             (insert "\n")
             (insert "Whether gnus assigns group parameters, or not, gnus will terminate with an\n")
             (insert "parameter to the value associated with the regular expression.\n")
             (insert "\n")
             (insert "Whether gnus assigns group parameters, or not, gnus will terminate with an\n")