Translate.

diff --git a/lisp/riece-300.el b/lisp/riece-300.el
index deed723..364490c 100644 (file)
--- a/lisp/riece-300.el
+++ b/lisp/riece-300.el
@@ -68,7 +68,7 @@
              (riece-concat-server-name
               (riece-concat-user-status
                status
              (riece-concat-server-name
               (riece-concat-user-status
                status

-               (format "%s is (%s)"
+               (format (riece-mcat "%s is (%s)")

                        (riece-format-identity
                         (riece-make-identity user riece-server-name)
                         t)
                        (riece-format-identity
                         (riece-make-identity user riece-server-name)
                         t)


@@ -81,7 +81,7 @@
    (list riece-dialogue-buffer riece-others-buffer)
    (concat
     (riece-concat-server-name
    (list riece-dialogue-buffer riece-others-buffer)
    (concat
     (riece-concat-server-name

-     (concat "Online: "
+     (concat (riece-mcat "Online: ")

             (mapconcat
              (lambda (user)
                (riece-format-identity
             (mapconcat
              (lambda (user)
                (riece-format-identity


@@ -106,7 +106,7 @@
         (list riece-dialogue-buffer riece-others-buffer)
         (concat
          (riece-concat-server-name
         (list riece-dialogue-buffer riece-others-buffer)
         (concat
          (riece-concat-server-name

-          (format "%s is away: %s"
+          (format (riece-mcat "%s is away: %s")

                   (riece-format-identity
                    (riece-make-identity user riece-server-name)
                    t)
                   (riece-format-identity
                    (riece-make-identity user riece-server-name)
                    t)


@@ -139,7 +139,7 @@
         (list riece-dialogue-buffer riece-others-buffer)
         (concat
          (riece-concat-server-name
         (list riece-dialogue-buffer riece-others-buffer)
         (concat
          (riece-concat-server-name

-          (format "%s is %s (%s)"
+          (format (riece-mcat "%s is %s (%s)")

                   (riece-format-identity
                    (riece-make-identity user riece-server-name)
                    t)
                   (riece-format-identity
                    (riece-make-identity user riece-server-name)
                    t)


@@ -155,7 +155,7 @@
        (list riece-dialogue-buffer riece-others-buffer)
        (concat
        (riece-concat-server-name
        (list riece-dialogue-buffer riece-others-buffer)
        (concat
        (riece-concat-server-name

-        (format "on via server %s: %s"
+        (format (riece-mcat "on via server %s: %s")

                 (match-string 2 string)
                 (substring string (match-end 0))))
        "\n"))))
                 (match-string 2 string)
                 (substring string (match-end 0))))
        "\n"))))


@@ -167,10 +167,10 @@
         (list riece-dialogue-buffer riece-others-buffer)
         (concat
          (riece-concat-server-name
         (list riece-dialogue-buffer riece-others-buffer)
         (concat
          (riece-concat-server-name

-          (concat (riece-format-identity
+          (format "%s is an IRC operator"
+                  (riece-format-identity

                    (riece-make-identity user riece-server-name)
                    (riece-make-identity user riece-server-name)

-                   t)
-                  " is an IRC operator"))
+                   t)))

          "\n")))))
 
 (defun riece-handle-317-message (prefix number name string)
          "\n")))))
 
 (defun riece-handle-317-message (prefix number name string)


@@ -179,15 +179,16 @@
        string)
       (let* ((user (match-string 1 string))
             (seconds (string-to-number (match-string 2 string)))
        string)
       (let* ((user (match-string 1 string))
             (seconds (string-to-number (match-string 2 string)))

-            (units (list (cons (/ seconds 60 60 24) "days")
-                         (cons (mod (/ seconds 60 60) 24) "hours")
-                         (cons (mod (/ seconds 60) 60) "minutes")
-                         (cons (mod seconds 60) "seconds"))))
+            (units (list (cons (/ seconds 60 60 24) (riece-mcat "days"))
+                         (cons (mod (/ seconds 60 60) 24)
+                               (riece-mcat "hours"))
+                         (cons (mod (/ seconds 60) 60) (riece-mcat "minutes"))
+                         (cons (mod seconds 60) (riece-mcat "seconds")))))

        (riece-insert-info
         (list riece-dialogue-buffer riece-others-buffer)
         (concat
          (riece-concat-server-name
        (riece-insert-info
         (list riece-dialogue-buffer riece-others-buffer)
         (concat
          (riece-concat-server-name

-          (format "%s is %s idle"
+          (format (riece-mcat "%s is %s idle")

                   (riece-format-identity
                    (riece-make-identity user riece-server-name)
                    t)
                   (riece-format-identity
                    (riece-make-identity user riece-server-name)
                    t)


@@ -236,7 +237,7 @@
        (list riece-dialogue-buffer riece-others-buffer)
        (concat
        (riece-concat-server-name
        (list riece-dialogue-buffer riece-others-buffer)
        (concat
        (riece-concat-server-name

-        (format "%s is running on %s: %s"
+        (format (riece-mcat "%s is running on %s: %s")

                 (match-string 1 string)
                 (match-string 2 string)
                 (substring string (match-end 0))))
                 (match-string 1 string)
                 (match-string 2 string)
                 (substring string (match-end 0))))


@@ -270,7 +271,8 @@
                                                         channel-identity))
          topic (nth 2 parameters))
     (riece-channel-set-topic (riece-get-channel channel) topic)
                                                         channel-identity))
          topic (nth 2 parameters))
     (riece-channel-set-topic (riece-get-channel channel) topic)

-    (riece-insert-info buffer (concat visible " users, topic: " topic "\n"))
+    (riece-insert-info buffer (format (riece-mcat "%s users, topic: %s\n")
+                                     visible topic))

     (riece-insert-info
      (if (and riece-channel-buffer-mode
              (not (eq buffer riece-channel-buffer)))
     (riece-insert-info
      (if (and riece-channel-buffer-mode
              (not (eq buffer riece-channel-buffer)))


@@ -278,7 +280,7 @@
        riece-dialogue-buffer)
      (concat
       (riece-concat-server-name
        riece-dialogue-buffer)
      (concat
       (riece-concat-server-name

-       (format "%s: %s users, topic: %s"
+       (format (riece-mcat "%s: %s users, topic: %s")

               (riece-format-identity channel-identity t) visible topic))
       "\n"))))
 
               (riece-format-identity channel-identity t) visible topic))
       "\n"))))
 


@@ -291,7 +293,8 @@
        (let* ((channel-identity (riece-make-identity channel
                                                      riece-server-name))
               (buffer (riece-channel-buffer channel-identity)))
        (let* ((channel-identity (riece-make-identity channel
                                                      riece-server-name))
               (buffer (riece-channel-buffer channel-identity)))

-         (riece-insert-info buffer (concat "Mode: " mode-string "\n"))
+         (riece-insert-info buffer (format (riece-mcat "Mode: ") mode-string
+                                           "\n"))

          (riece-insert-info
           (if (and riece-channel-buffer-mode
                    (not (eq buffer riece-channel-buffer)))
          (riece-insert-info
           (if (and riece-channel-buffer-mode
                    (not (eq buffer riece-channel-buffer)))


@@ -299,7 +302,7 @@
             riece-dialogue-buffer)
           (concat
            (riece-concat-server-name
             riece-dialogue-buffer)
           (concat
            (riece-concat-server-name

-            (format "Mode for %s: %s"
+            (format (riece-mcat "Mode for %s: %s")

                     (riece-format-identity channel-identity t)
                     mode-string))
            "\n"))))))
                     (riece-format-identity channel-identity t)
                     mode-string))
            "\n"))))))


@@ -317,7 +320,7 @@
                                                           channel-identity))
            topic (nth 1 parameters))
       (riece-channel-set-topic (riece-get-channel channel) topic)
                                                           channel-identity))
            topic (nth 1 parameters))
       (riece-channel-set-topic (riece-get-channel channel) topic)

-      (riece-insert-info buffer (concat "Topic: " topic "\n"))
+      (riece-insert-info buffer (concat (riece-mcat "Topic: ") topic "\n"))

       (riece-insert-info
        (if (and riece-channel-buffer-mode
                (not (eq buffer riece-channel-buffer)))
       (riece-insert-info
        (if (and riece-channel-buffer-mode
                (not (eq buffer riece-channel-buffer)))


@@ -325,7 +328,7 @@
         riece-dialogue-buffer)
        (concat
        (riece-concat-server-name
         riece-dialogue-buffer)
        (concat
        (riece-concat-server-name

-        (format "Topic for %s: %s"
+        (format (riece-mcat "Topic for %s: %s")

                 (riece-format-identity channel-identity t)
                 topic))
        "\n")))
                 (riece-format-identity channel-identity t)
                 topic))
        "\n")))


@@ -343,7 +346,7 @@
             (user (match-string 1 string))
             (channel-identity (riece-make-identity channel riece-server-name))
             (buffer (riece-channel-buffer channel-identity)))
             (user (match-string 1 string))
             (channel-identity (riece-make-identity channel riece-server-name))
             (buffer (riece-channel-buffer channel-identity)))

-       (riece-insert-info buffer (concat "Inviting " user "\n"))
+       (riece-insert-info buffer (format (riece-mcat "Inviting %s\n") user))

        (riece-insert-info
         (if (and riece-channel-buffer-mode
                  (not (eq buffer riece-channel-buffer)))
        (riece-insert-info
         (if (and riece-channel-buffer-mode
                  (not (eq buffer riece-channel-buffer)))


@@ -351,7 +354,7 @@
           riece-dialogue-buffer)
         (concat
          (riece-concat-server-name
           riece-dialogue-buffer)
         (concat
          (riece-concat-server-name

-          (format "Inviting %s to %s" user
+          (format (riece-mcat "Inviting %s to %s") user

                   (riece-format-identity channel-identity t)))
          "\n")))))
 
                   (riece-format-identity channel-identity t)))
          "\n")))))
 


@@ -458,7 +461,8 @@
        (riece-naming-assert-channel-users users channel)
        (riece-insert-info
         buffer
        (riece-naming-assert-channel-users users channel)
        (riece-insert-info
         buffer

-        (concat (format "%d users: " (length users)) string "\n"))
+        (concat (format (riece-mcat "%d users: ") (length users)) string
+                "\n"))

        (riece-insert-info
         (if (and riece-channel-buffer-mode
                  (not (eq buffer riece-channel-buffer)))
        (riece-insert-info
         (if (and riece-channel-buffer-mode
                  (not (eq buffer riece-channel-buffer)))


@@ -466,7 +470,7 @@
           riece-dialogue-buffer)
         (concat
          (riece-concat-server-name
           riece-dialogue-buffer)
         (concat
          (riece-concat-server-name

-          (concat (format "%d users on %s: "
+          (concat (format (riece-mcat "%d users on %s: ")

                           (length users)
                           (riece-format-identity channel-identity t))
                   string))
                           (length users)
                           (riece-format-identity channel-identity t))
                   string))

diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index 5241a68..8efa507 100644 (file)
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -39,7 +39,7 @@
 ;;; Channel movement:
 (defun riece-command-switch-to-channel (channel)
   (interactive (list (riece-completing-read-identity
 ;;; Channel movement:
 (defun riece-command-switch-to-channel (channel)
   (interactive (list (riece-completing-read-identity

-                     "Switch to channel/user: "
+                     (riece-mcat "Switch to channel/user: ")

                      riece-current-channels nil t)))
   (unless (equal channel riece-current-channel)
     (riece-switch-to-channel channel)))
                      riece-current-channels nil t)))
   (unless (equal channel riece-current-channel)
     (riece-switch-to-channel channel)))


@@ -49,7 +49,7 @@
    (let ((command-name (symbol-name this-command)))
      (if (string-match "[0-9]+$" command-name)
         (list (string-to-number (match-string 0 command-name)))
    (let ((command-name (symbol-name this-command)))
      (if (string-match "[0-9]+$" command-name)
         (list (string-to-number (match-string 0 command-name)))

-       (list (string-to-number (read-string "Switch to number: "))))))
+       (list (string-to-number (read-string (riece-mcat "Switch to number: ")))))))

   (let ((channel (nth (1- number) riece-current-channels)))
     (if channel
        (riece-command-switch-to-channel channel)
   (let ((channel (nth (1- number) riece-current-channels)))
     (if channel
        (riece-command-switch-to-channel channel)


@@ -133,7 +133,8 @@
 (defun riece-command-change-layout (name)
   "Select a layout-name from all current available layouts and change
 the layout to the selected layout-name."
 (defun riece-command-change-layout (name)
   "Select a layout-name from all current available layouts and change
 the layout to the selected layout-name."

-  (interactive (list (completing-read "Change layout: " riece-layout-alist)))
+  (interactive (list (completing-read (riece-mcat "Change layout: ")
+                                     riece-layout-alist)))

   (setq riece-layout name
        riece-save-variables-are-dirty t)
   (riece-command-configure-windows))
   (setq riece-layout name
        riece-save-variables-are-dirty t)
   (riece-command-configure-windows))


@@ -170,7 +171,7 @@ the layout to the selected layout-name."
   (interactive
    (let* ((completion-ignore-case t)
          (user (riece-completing-read-identity
   (interactive
    (let* ((completion-ignore-case t)
          (user (riece-completing-read-identity

-                "Finger user: "
+                (riece-mcat "Finger user: ")

                 (riece-get-users-on-server (riece-current-server-name))
                 nil nil nil nil nil t)))
      (list user current-prefix-arg)))
                 (riece-get-users-on-server (riece-current-server-name))
                 nil nil nil nil nil t)))
      (list user current-prefix-arg)))


@@ -185,14 +186,15 @@ the layout to the selected layout-name."
    (progn
      (riece-check-channel-commands-are-usable t)
      (list (read-from-minibuffer
    (progn
      (riece-check-channel-commands-are-usable t)
      (list (read-from-minibuffer

-           "Set topic: " (cons (or (riece-with-server-buffer
-                                    (riece-identity-server
-                                     riece-current-channel)
-                                    (riece-channel-get-topic
-                                     (riece-identity-prefix
-                                      riece-current-channel)))
-                                   "")
-                               0)))))
+           (riece-mcat "Set topic: ")
+           (cons (or (riece-with-server-buffer
+                         (riece-identity-server
+                          riece-current-channel)
+                       (riece-channel-get-topic
+                        (riece-identity-prefix
+                         riece-current-channel)))
+                     "")
+                 0)))))

   (riece-send-string (format "TOPIC %s :%s\r\n"
                             (riece-identity-prefix riece-current-channel)
                             topic)
   (riece-send-string (format "TOPIC %s :%s\r\n"
                             (riece-identity-prefix riece-current-channel)
                             topic)


@@ -203,7 +205,7 @@ the layout to the selected layout-name."
    (let ((completion-ignore-case t))
      (riece-check-channel-commands-are-usable t)
      (list (riece-completing-read-identity
    (let ((completion-ignore-case t))
      (riece-check-channel-commands-are-usable t)
      (list (riece-completing-read-identity

-           "Invite user: "
+           (riece-mcat "Invite user: ")

            (riece-get-users-on-server (riece-current-server-name))
            nil nil nil nil nil t))))
   (riece-send-string (format "INVITE %s :%s\r\n"
            (riece-get-users-on-server (riece-current-server-name))
            nil nil nil nil nil t))))
   (riece-send-string (format "INVITE %s :%s\r\n"


@@ -215,7 +217,7 @@ the layout to the selected layout-name."
    (let ((completion-ignore-case t))
      (riece-check-channel-commands-are-usable t)
      (list (completing-read
    (let ((completion-ignore-case t))
      (riece-check-channel-commands-are-usable t)
      (list (completing-read

-           "Kick user: "
+           (riece-mcat "Kick user: ")

            (riece-with-server-buffer
                (riece-identity-server riece-current-channel)
              (riece-channel-get-users (riece-identity-prefix
            (riece-with-server-buffer
                (riece-identity-server riece-current-channel)
              (riece-channel-get-users (riece-identity-prefix


@@ -236,42 +238,45 @@ the layout to the selected layout-name."
   (interactive
    (let ((completion-ignore-case t))
      (list (read-from-minibuffer
   (interactive
    (let ((completion-ignore-case t))
      (list (read-from-minibuffer

-           "NAMES pattern: "
+           (riece-mcat "NAMES pattern: ")

            (if (and riece-current-channel
                     (riece-channel-p (riece-identity-prefix
                                       riece-current-channel)))
                (cons (riece-identity-prefix riece-current-channel)
                      0))))))
   (if (or (not (equal pattern ""))
            (if (and riece-current-channel
                     (riece-channel-p (riece-identity-prefix
                                       riece-current-channel)))
                (cons (riece-identity-prefix riece-current-channel)
                      0))))))
   (if (or (not (equal pattern ""))

-         (yes-or-no-p "Really want to query NAMES without argument? "))
+         (yes-or-no-p (riece-mcat
+                       "Really want to query NAMES without argument? ")))

       (riece-send-string (format "NAMES %s\r\n" pattern))))
 
 (defun riece-command-who (pattern)
   (interactive
    (let ((completion-ignore-case t))
      (list (read-from-minibuffer
       (riece-send-string (format "NAMES %s\r\n" pattern))))
 
 (defun riece-command-who (pattern)
   (interactive
    (let ((completion-ignore-case t))
      (list (read-from-minibuffer

-           "WHO pattern: "
+           (riece-mcat "WHO pattern: ")

            (if (and riece-current-channel
                     (riece-channel-p (riece-identity-prefix
                                       riece-current-channel)))
                (cons (riece-identity-prefix riece-current-channel)
                      0))))))
   (if (or (not (equal pattern ""))
            (if (and riece-current-channel
                     (riece-channel-p (riece-identity-prefix
                                       riece-current-channel)))
                (cons (riece-identity-prefix riece-current-channel)
                      0))))))
   (if (or (not (equal pattern ""))

-         (yes-or-no-p "Really want to query WHO without argument? "))
+         (yes-or-no-p (riece-mcat
+                       "Really want to query WHO without argument? ")))

       (riece-send-string (format "WHO %s\r\n" pattern))))
 
 (defun riece-command-list (pattern)
   (interactive
    (let ((completion-ignore-case t))
      (list (read-from-minibuffer
       (riece-send-string (format "WHO %s\r\n" pattern))))
 
 (defun riece-command-list (pattern)
   (interactive
    (let ((completion-ignore-case t))
      (list (read-from-minibuffer

-           "LIST pattern: "
+           (riece-mcat "LIST pattern: ")

            (if (and riece-current-channel
                     (riece-channel-p (riece-identity-prefix
                                       riece-current-channel)))
                (cons (riece-identity-prefix riece-current-channel)
                      0))))))
   (if (or (not (equal pattern ""))
            (if (and riece-current-channel
                     (riece-channel-p (riece-identity-prefix
                                       riece-current-channel)))
                (cons (riece-identity-prefix riece-current-channel)
                      0))))))
   (if (or (not (equal pattern ""))

-         (yes-or-no-p "Really want to query LIST without argument? "))
+         (yes-or-no-p (riece-mcat
+                       "Really want to query LIST without argument? ")))

       (riece-send-string (format "LIST %s\r\n" pattern))))
 
 (defun riece-command-change-mode (channel change)
       (riece-send-string (format "LIST %s\r\n" pattern))))
 
 (defun riece-command-change-mode (channel change)


@@ -280,14 +285,14 @@ the layout to the selected layout-name."
          (channel
           (if current-prefix-arg
               (riece-completing-read-identity
          (channel
           (if current-prefix-arg
               (riece-completing-read-identity

-               "Change mode for channel/user: "
+               (riece-mcat "Change mode for channel/user: ")

                (riece-get-identities-on-server (riece-current-server-name))
                nil nil nil nil nil t)
             (riece-check-channel-commands-are-usable t)
             riece-current-channel))
          (riece-overriding-server-name (riece-identity-server channel))
          (riece-temp-minibuffer-message
                (riece-get-identities-on-server (riece-current-server-name))
                nil nil nil nil nil t)
             (riece-check-channel-commands-are-usable t)
             riece-current-channel))
          (riece-overriding-server-name (riece-identity-server channel))
          (riece-temp-minibuffer-message

-          (concat "[Available modes: "
+          (concat (riece-mcat "[Available modes: ")

                   (riece-with-server-buffer (riece-identity-server channel)
                     (if (riece-channel-p (riece-identity-prefix channel))
                         (if riece-supported-channel-modes
                   (riece-with-server-buffer (riece-identity-server channel)
                     (if (riece-channel-p (riece-identity-prefix channel))
                         (if riece-supported-channel-modes


@@ -298,7 +303,7 @@ the layout to the selected layout-name."
      (list channel
           (read-from-minibuffer
            (concat (riece-concat-channel-modes
      (list channel
           (read-from-minibuffer
            (concat (riece-concat-channel-modes

-                    channel "Mode (? for help)") ": ")
+                    channel (riece-mcat "Mode (? for help)")) ": ")

            nil riece-minibuffer-map))))
   (if (equal change "")
       (riece-send-string (format "MODE %s\r\n"
            nil riece-minibuffer-map))))
   (if (equal change "")
       (riece-send-string (format "MODE %s\r\n"


@@ -314,8 +319,8 @@ the layout to the selected layout-name."
      (let ((completion-ignore-case t))
        (list (riece-completing-read-multiple
              (if current-prefix-arg
      (let ((completion-ignore-case t))
        (list (riece-completing-read-multiple
              (if current-prefix-arg

-                 "Unset +o for users"
-               "Set +o for users")
+                 (riece-mcat "Unset +o for users")
+               (riece-mcat "Set +o for users"))

              (riece-with-server-buffer
                  (riece-identity-server riece-current-channel)
                (riece-channel-get-users (riece-identity-prefix
              (riece-with-server-buffer
                  (riece-identity-server riece-current-channel)
                (riece-channel-get-users (riece-identity-prefix


@@ -349,8 +354,8 @@ the layout to the selected layout-name."
      (let ((completion-ignore-case t))
        (list (riece-completing-read-multiple
              (if current-prefix-arg
      (let ((completion-ignore-case t))
        (list (riece-completing-read-multiple
              (if current-prefix-arg

-                 "Unset +v for users"
-               "Set +v for users")
+                 (riece-mcat "Unset +v for users")
+               (riece-mcat "Set +v for users"))

              (riece-with-server-buffer
                  (riece-identity-server riece-current-channel)
                (riece-channel-get-users (riece-identity-prefix
              (riece-with-server-buffer
                  (riece-identity-server riece-current-channel)
                (riece-channel-get-users (riece-identity-prefix


@@ -381,7 +386,7 @@ the layout to the selected layout-name."
   "Send MESSAGE to the current channel."
   (run-hooks 'riece-command-send-message-hook)
   (if (equal message "")
   "Send MESSAGE to the current channel."
   (run-hooks 'riece-command-send-message-hook)
   (if (equal message "")

-      (error "No text to send"))
+      (error (riece-mcat "No text to send")))

   (riece-check-channel-commands-are-usable)
   (if notice
       (progn
   (riece-check-channel-commands-are-usable)
   (if notice
       (progn


@@ -429,7 +434,7 @@ the layout to the selected layout-name."
        (error "No text to send")
      (let ((completion-ignore-case t))
        (list (riece-completing-read-identity
        (error "No text to send")
      (let ((completion-ignore-case t))
        (list (riece-completing-read-identity

-             "Message to user: "
+             (riece-mcat "Message to user: ")

              (riece-get-users-on-server (riece-current-server-name))
              nil nil nil nil nil t)))))
   (let ((text (buffer-substring
              (riece-get-users-on-server (riece-current-server-name))
              nil nil nil nil nil t)))))
   (let ((text (buffer-substring


@@ -470,11 +475,11 @@ the layout to the selected layout-name."
          (let ((default (riece-format-identity
                          riece-join-channel-candidate)))
            (riece-completing-read-identity
          (let ((default (riece-format-identity
                          riece-join-channel-candidate)))
            (riece-completing-read-identity

-            (format "Join channel/user (default %s): " default)
+            (format (riece-mcat "Join channel/user (default %s): ") default)

             (riece-get-identities-on-server (riece-current-server-name))
             nil nil nil nil default))
        (riece-completing-read-identity
             (riece-get-identities-on-server (riece-current-server-name))
             nil nil nil nil default))
        (riece-completing-read-identity

-        "Join channel/user: "
+        (riece-mcat "Join channel/user: ")

         (riece-get-identities-on-server (riece-current-server-name)))))))
   (let ((pointer (riece-identity-member target riece-current-channels)))
     (if pointer
         (riece-get-identities-on-server (riece-current-server-name)))))))
   (let ((pointer (riece-identity-member target riece-current-channels)))
     (if pointer


@@ -502,13 +507,13 @@ the layout to the selected layout-name."
      (let* ((completion-ignore-case t)
            (target
             (riece-completing-read-identity
      (let* ((completion-ignore-case t)
            (target
             (riece-completing-read-identity

-             (format "Part from channel/user (default %s): "
+             (format (riece-mcat "Part from channel/user (default %s): ")

                      (riece-format-identity riece-current-channel))
              riece-current-channels nil nil nil nil
              (riece-format-identity riece-current-channel)))
            (message
             (if current-prefix-arg
                      (riece-format-identity riece-current-channel))
              riece-current-channels nil nil nil nil
              (riece-format-identity riece-current-channel)))
            (message
             (if current-prefix-arg

-                (read-string "Message: ")
+                (read-string (riece-mcat "Message: "))

               riece-part-message)))
        (list target message))))
   (if (riece-identity-member target riece-current-channels)
               riece-part-message)))
        (list target message))))
   (if (riece-identity-member target riece-current-channels)


@@ -534,7 +539,7 @@ the layout to the selected layout-name."
            (let ((other-window-scroll-buffer buffer))
              (scroll-other-window-down lines))
          (beginning-of-buffer
            (let ((other-window-scroll-buffer buffer))
              (scroll-other-window-down lines))
          (beginning-of-buffer

-          (message "Beginning of buffer"))))))
+          (message (riece-mcat "Beginning of buffer")))))))

 
 (defun riece-command-scroll-up (lines)
   "Scroll LINES up dialogue buffer from command buffer."
 
 (defun riece-command-scroll-up (lines)
   "Scroll LINES up dialogue buffer from command buffer."


@@ -548,7 +553,7 @@ the layout to the selected layout-name."
            (let ((other-window-scroll-buffer buffer))
              (scroll-other-window lines))
          (end-of-buffer
            (let ((other-window-scroll-buffer buffer))
              (scroll-other-window lines))
          (end-of-buffer

-          (message "End of buffer"))))))
+          (message (riece-mcat "End of buffer")))))))

 
 (defun riece-command-user-list-scroll-down (lines)
   "Scroll LINES down user list buffer from command buffer."
 
 (defun riece-command-user-list-scroll-down (lines)
   "Scroll LINES down user list buffer from command buffer."


@@ -558,7 +563,7 @@ the layout to the selected layout-name."
          (let ((other-window-scroll-buffer riece-user-list-buffer))
            (scroll-other-window-down lines))
        (beginning-of-buffer
          (let ((other-window-scroll-buffer riece-user-list-buffer))
            (scroll-other-window-down lines))
        (beginning-of-buffer

-        (message "Beginning of buffer")))))
+        (message (riece-mcat "Beginning of buffer"))))))

 
 (defun riece-command-user-list-scroll-up (lines)
   "Scroll LINES up user list buffer from command buffer."
 
 (defun riece-command-user-list-scroll-up (lines)
   "Scroll LINES up user list buffer from command buffer."


@@ -568,7 +573,7 @@ the layout to the selected layout-name."
          (let ((other-window-scroll-buffer riece-user-list-buffer))
            (scroll-other-window lines))
        (end-of-buffer
          (let ((other-window-scroll-buffer riece-user-list-buffer))
            (scroll-other-window lines))
        (end-of-buffer

-        (message "End of buffer")))))
+        (message (riece-mcat "End of buffer"))))))

 
 (defun riece-command-toggle-away (&optional message)
   "Mark yourself as being away."
 
 (defun riece-command-toggle-away (&optional message)
   "Mark yourself as being away."


@@ -579,7 +584,8 @@ the layout to the selected layout-name."
                                         (riece-current-nickname)))))
            current-prefix-arg)
        (list (read-from-minibuffer
                                         (riece-current-nickname)))))
            current-prefix-arg)
        (list (read-from-minibuffer

-             "Away message: " (cons (or riece-away-message "") 0)))))
+             (riece-mcat "Away message: ") (cons (or riece-away-message "")
+                                                 0)))))

   (if (riece-with-server-buffer (riece-identity-server
                                 (riece-current-nickname))
        (riece-user-get-away (riece-identity-prefix
   (if (riece-with-server-buffer (riece-identity-server
                                 (riece-current-nickname))
        (riece-user-get-away (riece-identity-prefix


@@ -632,12 +638,12 @@ If prefix argument ARG is non-nil, toggle frozen status."
   (interactive "P")
   (if (null riece-server-process-alist)
       (progn
   (interactive "P")
   (if (null riece-server-process-alist)
       (progn

-       (message "No server process")
+       (message (riece-mcat "No server process"))

        (ding))
     (if (y-or-n-p (riece-mcat "Really quit IRC? "))
        (let ((message
               (if arg
        (ding))
     (if (y-or-n-p (riece-mcat "Really quit IRC? "))
        (let ((message
               (if arg

-                  (read-string "Message: ")
+                  (read-string (riece-mcat "Message: "))

                 riece-quit-message))
              (alist riece-server-process-alist))
          (while alist
                 riece-quit-message))
              (alist riece-server-process-alist))
          (while alist


@@ -698,7 +704,7 @@ If prefix argument ARG is non-nil, toggle frozen status."
     (if (eq completion t)
        nil
       (if (null completion)
     (if (eq completion t)
        nil
       (if (null completion)

-         (message "Can't find completion for \"%s\"" current)
+         (message (riece-mcat "Can't find completion for \"%s\"") current)

        (if (equal current completion)
            (with-output-to-temp-buffer "*Help*"
              (display-completion-list all))
        (if (equal current completion)
            (with-output-to-temp-buffer "*Help*"
              (display-completion-list all))


@@ -708,7 +714,7 @@ If prefix argument ARG is non-nil, toggle frozen status."
 
 (defun riece-command-open-server (server-name)
   (interactive
 
 (defun riece-command-open-server (server-name)
   (interactive

-   (list (completing-read "Open server: " riece-server-alist)))
+   (list (completing-read (riece-mcat "Open server: ") riece-server-alist)))

   (if (riece-server-process server-name)
       (error "%s is already opened" server-name))
   (riece-open-server
   (if (riece-server-process server-name)
       (error "%s is already opened" server-name))
   (riece-open-server


@@ -717,9 +723,10 @@ If prefix argument ARG is non-nil, toggle frozen status."
 
 (defun riece-command-close-server (server-name &optional message)
   (interactive
 
 (defun riece-command-close-server (server-name &optional message)
   (interactive

-   (list (completing-read "Close server: " riece-server-process-alist)
+   (list (completing-read (riece-mcat "Close server: ")
+                         riece-server-process-alist)

         (if current-prefix-arg
         (if current-prefix-arg

-            (read-string "Message: ")
+            (read-string (riece-mcat "Message: "))

           riece-quit-message)))
   (let ((process (riece-server-process server-name)))
     (unless process
           riece-quit-message)))
   (let ((process (riece-server-process server-name)))
     (unless process


@@ -729,10 +736,10 @@ If prefix argument ARG is non-nil, toggle frozen status."
 (defun riece-command-universal-server-name-argument ()
   (interactive)
   (let* ((riece-overriding-server-name
 (defun riece-command-universal-server-name-argument ()
   (interactive)
   (let* ((riece-overriding-server-name

-         (completing-read "Server: " riece-server-process-alist))
+         (completing-read (riece-mcat "Server: ") riece-server-process-alist))

         (command
          (key-binding (read-key-sequence
         (command
          (key-binding (read-key-sequence

-                       (format "Command to execute on \"%s\":"
+                       (format (riece-mcat "Command to execute on \"%s\":")

                                riece-overriding-server-name)))))
     (message "")
     (call-interactively command)))
                                riece-overriding-server-name)))))
     (message "")
     (call-interactively command)))


@@ -743,7 +750,7 @@ If prefix argument ARG is non-nil, toggle frozen status."
   "Save `riece-variables-file'."
   (interactive)
   (if (or riece-save-variables-are-dirty
   "Save `riece-variables-file'."
   (interactive)
   (if (or riece-save-variables-are-dirty

-         (y-or-n-p "No changes made.  Save anyway? "))
+         (y-or-n-p (riece-mcat "No changes made.  Save anyway? ")))

       (riece-save-variables-files)))
 
 (provide 'riece-commands)
       (riece-save-variables-files)))
 
 (provide 'riece-commands)

diff --git a/lisp/riece-mcat-japanese.el b/lisp/riece-mcat-japanese.el
index 5764f20..9681dc2 100644 (file)
--- a/lisp/riece-mcat-japanese.el
+++ b/lisp/riece-mcat-japanese.el
@@ -27,15 +27,31 @@
 ;;; Code:
 
 (defconst riece-mcat-japanese-alist
 ;;; Code:
 
 (defconst riece-mcat-japanese-alist

-  '(("%s (%s) has joined %s" . "%s (%s) \e$B$,\e(B %s \e$B$K;22C$7$^$7$?\e(B")
+  '(("%d users on %s: " . "%d \e$B?M$,\e(B %s \e$B$K$$$^$9\e(B: ")
+    ("%d users: " . "%d \e$B?M\e(B: ")
+    ("%s (%s) has joined %s" . "%s (%s) \e$B$,\e(B %s \e$B$K;22C$7$^$7$?\e(B")

     ("%s (%s) has joined %s\n" . "%s (%s) \e$B$,\e(B %s \e$B$K;22C$7$^$7$?\e(B\n")
     ("%s has left %s" . "%s \e$B$,\e(B %s \e$B$rN%$l$^$7$?\e(B")
     ("%s has left IRC" . "%s \e$B$,\e(B IRC \e$B$rN%$l$^$7$?\e(B")
     ("%s invites %s to %s" . "%s \e$B$,\e(B %s \e$B$r\e(B %s \e$B$K>7BT$7$F$$$^$9\e(B")
     ("%s (%s) has joined %s\n" . "%s (%s) \e$B$,\e(B %s \e$B$K;22C$7$^$7$?\e(B\n")
     ("%s has left %s" . "%s \e$B$,\e(B %s \e$B$rN%$l$^$7$?\e(B")
     ("%s has left IRC" . "%s \e$B$,\e(B IRC \e$B$rN%$l$^$7$?\e(B")
     ("%s invites %s to %s" . "%s \e$B$,\e(B %s \e$B$r\e(B %s \e$B$K>7BT$7$F$$$^$9\e(B")

+    ("%s is %s (%s)" . "%s \e$B$O\e(B %s (%s)")
+    ("%s is %s idle" . "%s \e$B$O\e(B %s \e$B%"%$%I%k>uBV\e(B")
+    ("%s is (%s)" . "%s \e$B$O\e(B (%s)")
+    ("%s is away: %s" . "%s \e$B$ON%@JCf\e(B: %s")
+    ("%s is running on %s: %s" . "%s \e$B$,\e(B %s \e$B$GF0$$$F$$$^$9\e(B: %s")

     ("%s kicked %s out from %s" . "%s \e$B$,\e(B %s \e$B$r\e(B %s \e$B$+$i=3$j=P$7$^$7$?\e(B")
     ("%s kicked %s out from %s\n" . "%s \e$B$,\e(B %s \e$B$r\e(B %s \e$B$+$i=3$j=P$7$^$7$?\e(B\n")
     ("%s killed %s" . "%s \e$B$,\e(B %s \e$B$r;&$7$^$7$?\e(B")
     ("%s kicked %s out from %s" . "%s \e$B$,\e(B %s \e$B$r\e(B %s \e$B$+$i=3$j=P$7$^$7$?\e(B")
     ("%s kicked %s out from %s\n" . "%s \e$B$,\e(B %s \e$B$r\e(B %s \e$B$+$i=3$j=P$7$^$7$?\e(B\n")
     ("%s killed %s" . "%s \e$B$,\e(B %s \e$B$r;&$7$^$7$?\e(B")

+    ("%s users, topic: %s\n" . "%s \e$B?M!"%H%T%C%/\e(B: %s\n")
+    ("%s: %s users, topic: %s" . "%s: %s \e$B?M!"%H%T%C%/\e(B: %s\n")

     ("Already registered" . "\e$BEPO?:Q$_$G$9\e(B")
     ("Already registered" . "\e$BEPO?:Q$_$G$9\e(B")

+    ("Away message: " . "\e$BN%@J$N%a%C%;!<%8\e(B: ")
+    ("Beginning of buffer" . "\e$B%P%C%U%!$N@hF,$G$9\e(B")
+    ("Can't find completion for \"%s\"" . "\"%s\" \e$B$KBP$9$kJd40$,8+$D$+$j$^$;$s\e(B")
+    ("Change layout: " . "\e$BJQ998e$N%l%$%"%&%H\e(B: ")
+    ("Change mode for channel/user: " . "\e$B%b!<%I$rJQ99$9$k%A%c%s%M%k$^$?$O%f!<%6\e(B: ")
+    ("Close server: " . "\e$B@\B3$rJD$8$k%5!<%P\e(B: ")
+    ("Command to execute on \"%s\":" . "\"%s\" \e$B$G<B9T$9$k%3%^%s%I\e(B: ")

     ("Connecting to %s..." . "%s \e$B$K@\B3$7$F$$$^$9\e(B...")
     ("Connecting to %s...done" . "%s \e$B$K@\B3$7$F$$$^$9\e(B...\e$B40N;\e(B")
     ("Connecting to %s...failed: %S" . "%s \e$B$K@\B3$7$F$$$^$9\e(B...\e$B<:GT\e(B: %S")
     ("Connecting to %s..." . "%s \e$B$K@\B3$7$F$$$^$9\e(B...")
     ("Connecting to %s...done" . "%s \e$B$K@\B3$7$F$$$^$9\e(B...\e$B40N;\e(B")
     ("Connecting to %s...failed: %S" . "%s \e$B$K@\B3$7$F$$$^$9\e(B...\e$B<:GT\e(B: %S")


@@ -43,24 +59,48 @@
     ("Connecting to IRC server...done" . "IRC \e$B%5!<%P$K@\B3$7$F$$$^$9\e(B...\e$B40N;\e(B")
     ("Connecting to IRC server...failed: %S" . "IRC \e$B%5!<%P$K@\B3$7$F$$$^$9\e(B...\e$B<:GT\e(B: %S")
     ("Created on %s\n" . "%s \e$B$K:n@.$5$l$^$7$?\e(B\n")
     ("Connecting to IRC server...done" . "IRC \e$B%5!<%P$K@\B3$7$F$$$^$9\e(B...\e$B40N;\e(B")
     ("Connecting to IRC server...failed: %S" . "IRC \e$B%5!<%P$K@\B3$7$F$$$^$9\e(B...\e$B<:GT\e(B: %S")
     ("Created on %s\n" . "%s \e$B$K:n@.$5$l$^$7$?\e(B\n")

+    ("End of buffer" . "\e$B%P%C%U%!$N=*C<$G$9\e(B")

     ("Erroneous nickname \"%s\".  Choose a new one: " . "\e$B<U$C$?%K%C%/%M!<%`\e(B \"%s\"\e$B!#?7$7$$%K%C%/%M!<%`\e(B: ")
     ("Erroneous nickname \"%s\".  Choose a new one: " . "\e$B<U$C$?%K%C%/%M!<%`\e(B \"%s\"\e$B!#?7$7$$%K%C%/%M!<%`\e(B: ")

+    ("Finger user: " . "\e$B?H85$rD4$Y$k%f!<%6\e(B: ")
+    ("Invite user: " . "\e$B>7BT$9$k%f!<%6\e(B: ")
+    ("Inviting %s\n" . "%s \e$B$r>7BT$7$F$$$^$9\e(B\n")
+    ("Inviting %s to %s" . "%s \e$B$r\e(B %s \e$B$K>7BT$7$F$$$^$9\e(B")
+    ("Join channel/user (default %s): " . "\e$B;22C$9$k%A%c%s%M%k$^$?$O%f!<%6\e(B (\e$B4{DjCM\e(B %s): ")
+    ("Join channel/user: " . "\e$B;22C$9$k%A%c%s%M%k$^$?$O%f!<%6\e(B: ")

     ("Key for %s: " . "%s \e$B$N%-!<\e(B: ")
     ("Key for %s: Quit" . "%s \e$B$N%-!<\e(B: \e$BCf;_\e(B")
     ("Key for %s: " . "%s \e$B$N%-!<\e(B: ")
     ("Key for %s: Quit" . "%s \e$B$N%-!<\e(B: \e$BCf;_\e(B")

+    ("Kick user: " . "\e$B=3$j=P$9%f!<%6\e(B: ")
+    ("LIST pattern: " . "LIST \e$B$N%Q%?!<%s\e(B: ")

     ("Logging in to %s..." . "%s \e$B$K%m%0%$%s$7$F$$$^$9\e(B...")
     ("Logging in to %s...done" . "%s \e$B$K%m%0%$%s$7$F$$$^$9\e(B...\e$B40N;\e(B")
     ("Logging in to IRC server..." . "IRC \e$B%5!<%P$K%m%0%$%s$7$F$$$^$9\e(B...")
     ("Logging in to IRC server...done" . "IRC \e$B%5!<%P$K%m%0%$%s$7$F$$$^$9\e(B...\e$B40N;\e(B")
     ("Logging in to %s..." . "%s \e$B$K%m%0%$%s$7$F$$$^$9\e(B...")
     ("Logging in to %s...done" . "%s \e$B$K%m%0%$%s$7$F$$$^$9\e(B...\e$B40N;\e(B")
     ("Logging in to IRC server..." . "IRC \e$B%5!<%P$K%m%0%$%s$7$F$$$^$9\e(B...")
     ("Logging in to IRC server...done" . "IRC \e$B%5!<%P$K%m%0%$%s$7$F$$$^$9\e(B...\e$B40N;\e(B")

+    ("Message to user: " . "\e$B%f!<%6$X$N%a%C%;!<%8\e(B: ")
+    ("Message: " . "\e$B%a%C%;!<%8\e(B")
+    ("Mode (? for help)" . "\e$B%b!<%I\e(B (\e$B%X%k%W$O\e(B ?)")

     ("Mode by %s: %s\n" . "%s \e$B$K$h$k%b!<%I@_Dj\e(B: %s\n")
     ("Mode by %s: %s\n" . "%s \e$B$K$h$k%b!<%I@_Dj\e(B: %s\n")

+    ("Mode for %s: %s" . "%s \e$B$N%b!<%I\e(B: %s")

     ("Mode on %s by %s: %s" . "%s \e$B$N%b!<%I$,\e(B %s \e$B$K$h$j@_Dj$5$l$^$7$?\e(B: %s")
     ("Mode on %s by %s: %s" . "%s \e$B$N%b!<%I$,\e(B %s \e$B$K$h$j@_Dj$5$l$^$7$?\e(B: %s")

+    ("Mode: " . "\e$B%b!<%I\e(B: ")
+    ("NAMES pattern: " . "NAMES \e$B$N%Q%?!<%s\e(B: ")

     ("Nickname \"%s\" already in use.  Choose a new one: " . "\e$B%K%C%/%M!<%`\e(B \"%s\" \e$B$O4{$K;HMQ$5$l$F$$$^$9!#?7$7$$%K%C%/%M!<%`\e(B: ")
     ("Nickname \"%s\" already in use.  Choose a new one: " . "\e$B%K%C%/%M!<%`\e(B \"%s\" \e$B$O4{$K;HMQ$5$l$F$$$^$9!#?7$7$$%K%C%/%M!<%`\e(B: ")

+    ("No changes made.  Save anyway? " . "\e$BJQ99$,$"$j$^$;$s$,!"J]B8$7$^$9$+\e(B? ")

     ("No channel" . "\e$B%A%c%s%M%k$J$7\e(B")
     ("No channel" . "\e$B%A%c%s%M%k$J$7\e(B")

+    ("No server process" . "\e$B%5!<%P$N%W%m%;%9$,$"$j$^$;$s\e(B")
+    ("No text to send" . "\e$BAw?.$9$k%F%-%9%H$,$"$j$^$;$s\e(B")

     ("None" . "\e$B$J$7\e(B")
     ("None" . "\e$B$J$7\e(B")

+    ("Online: " . "\e$B%*%s%i%$%s\e(B: ")
+    ("Open server: " . "\e$B@\B3$9$k%5!<%P\e(B: ")
+    ("Part from channel/user (default %s): " . "\e$BN%C&$9$k%A%c%s%M%k$^$?$O%f!<%6\e(B (\e$B4{DjCM\e(B %s): ")

     ("Password for %s: " . "%s \e$B$N%Q%9%o!<%I\e(B: ")
     ("Password for %s: Quit" . "%s \e$B$N%Q%9%o!<%I\e(B: \e$BCf;_\e(B")
     ("Password incorrect from %s." . "%s \e$B$N%Q%9%o!<%I$,IT@5$G$9!#\e(B")
     ("Password: " . "\e$B%Q%9%o!<%I\e(B: ")
     ("Password: Quit" . "\e$B%Q%9%o!<%I\e(B: \e$BCf;_\e(B")
     ("Really quit IRC? " . "\e$BK\Ev$K\e(B IRC \e$B$r$d$a$^$9$+\e(B? ")
     ("Password for %s: " . "%s \e$B$N%Q%9%o!<%I\e(B: ")
     ("Password for %s: Quit" . "%s \e$B$N%Q%9%o!<%I\e(B: \e$BCf;_\e(B")
     ("Password incorrect from %s." . "%s \e$B$N%Q%9%o!<%I$,IT@5$G$9!#\e(B")
     ("Password: " . "\e$B%Q%9%o!<%I\e(B: ")
     ("Password: Quit" . "\e$B%Q%9%o!<%I\e(B: \e$BCf;_\e(B")
     ("Really quit IRC? " . "\e$BK\Ev$K\e(B IRC \e$B$r$d$a$^$9$+\e(B? ")

+    ("Really want to query LIST without argument? " . "\e$BK\Ev$K0z?t$J$7$N\e(B LIST \e$B$rH/9T$7$^$9$+\e(B? ")
+    ("Really want to query NAMES without argument? " . "\e$BK\Ev$K0z?t$J$7$N\e(B NAMES \e$B$rH/9T$7$^$9$+\e(B? ")
+    ("Really want to query WHO without argument? " . "\e$BK\Ev$K0z?t$J$7$N\e(B WHO \e$B$rH/9T$7$^$9$+\e(B? ")

     ("Recent messages of the day:\n" . "\e$B:G6a$N%a%C%;!<%8\e(B(\e$B:#F|Cf\e(B):\n")
     ("Recent messages up to %d lines:\n" . "\e$B:G6a$N%a%C%;!<%8\e(B(%d\e$B9T\e(B):\n")
     ("Sending QUIT to \"%s\"..." . "\"%s\" \e$B$K\e(B QUIT \e$B$rAw?.$7$F$$$^$9\e(B...")
     ("Recent messages of the day:\n" . "\e$B:G6a$N%a%C%;!<%8\e(B(\e$B:#F|Cf\e(B):\n")
     ("Recent messages up to %d lines:\n" . "\e$B:G6a$N%a%C%;!<%8\e(B(%d\e$B9T\e(B):\n")
     ("Sending QUIT to \"%s\"..." . "\"%s\" \e$B$K\e(B QUIT \e$B$rAw?.$7$F$$$^$9\e(B...")


@@ -68,9 +108,25 @@
     ("Sending QUIT..." . "QUIT \e$B$rAw?.$7$F$$$^$9\e(B...")
     ("Sending QUIT...done" . "QUIT \e$B$rAw?.$7$F$$$^$9\e(B...\e$B40N;\e(B")
     ("Server: " . "\e$B%5!<%P\e(B")
     ("Sending QUIT..." . "QUIT \e$B$rAw?.$7$F$$$^$9\e(B...")
     ("Sending QUIT...done" . "QUIT \e$B$rAw?.$7$F$$$^$9\e(B...\e$B40N;\e(B")
     ("Server: " . "\e$B%5!<%P\e(B")

+    ("Set +o for users" . "+o \e$B$9$k%f!<%6\e(B")
+    ("Set +v for users" . "+v \e$B$9$k%f!<%6\e(B")
+    ("Set topic: " . "\e$B?7$7$$%H%T%C%/\e(B: ")
+    ("Switch to channel/user: " . "\e$B0\F0@h$N%A%c%s%M%k$^$?$O%f!<%6\e(B: ")
+    ("Switch to number: " . "\e$B0\F0@h$NHV9f\e(B: ")

     ("Topic by %s: %s\n" . "%s \e$B$K$h$k%H%T%C%/@_Dj\e(B: %s\n")
     ("Topic by %s: %s\n" . "%s \e$B$K$h$k%H%T%C%/@_Dj\e(B: %s\n")

+    ("Topic for %s: %s" . "%s \e$B$N%H%T%C%/\e(B: ")

     ("Topic on %s by %s: %s" . "%s \e$B$N%H%T%C%/$,\e(B %s \e$B$K$h$j@_Dj$5$l$^$7$?\e(B: %s")
     ("Topic on %s by %s: %s" . "%s \e$B$N%H%T%C%/$,\e(B %s \e$B$K$h$j@_Dj$5$l$^$7$?\e(B: %s")

-    ("Type \\[describe-mode] for help" . "\e$B%X%k%W$r8+$k$K$O\e(B \\[describe-mode]")))
+    ("Topic: " . "\e$B%H%T%C%/\e(B: ")
+    ("Type \\[describe-mode] for help" . "\e$B%X%k%W$r8+$k$K$O\e(B \\[describe-mode]")
+    ("Unset +o for users" . "-o \e$B$9$k%f!<%6\e(B")
+    ("Unset +v for users" . "-v \e$B$9$k%f!<%6\e(B")
+    ("WHO pattern: " . "WHO \e$B$N%Q%?!<%s\e(B: ")
+    ("[Available modes: " . "[\e$B;HMQ2DG=$J%b!<%I\e(B: ")
+    ("days" . "\e$BF|\e(B")
+    ("hours" . "\e$B;~4V\e(B")
+    ("minutes" . "\e$BJ,\e(B")
+    ("on via server %s: %s" . "\e$B%5!<%P\e(B %s \e$B7PM3\e(B: %s")
+    ("seconds" . "\e$BIC\e(B")))

 
 (provide 'riece-mcat-japanese)
 
 
 (provide 'riece-mcat-japanese)