Translate.

diff --git a/lisp/riece-000.el b/lisp/riece-000.el
index 4651d59..277cae5 100644 (file)
--- a/lisp/riece-000.el
+++ b/lisp/riece-000.el
@@ -38,7 +38,7 @@
 (defun riece-handle-001-message (prefix number name string)
   "RPL_WELCOME \"Welcome to the Internet Relay Network <nick>!<user>@<host>\""
   (if riece-real-server-name
-      (error "Already registered"))
+      (error (riece-mcat "Already registered")))
   (setq riece-real-server-name prefix
        riece-real-nickname name
        riece-real-userhost nil)
@@ -50,8 +50,8 @@
    (list riece-dialogue-buffer riece-others-buffer)
    (concat (substring string 1) "\n"))
   (if (equal riece-server-name "")
-      (message "Logging in to IRC server...done")
-    (message "Logging in to %s...done" riece-server-name))
+      (message (riece-mcat "Logging in to IRC server...done"))
+    (message (riece-mcat "Logging in to %s...done") riece-server-name))
   (let ((channel-list riece-startup-channel-list)
        entry identity)
     (while channel-list

diff --git a/lisp/riece-irc.el b/lisp/riece-irc.el
index 631a531..a621c24 100644 (file)
--- a/lisp/riece-irc.el
+++ b/lisp/riece-irc.el
@@ -26,6 +26,7 @@
 
 (require 'riece-filter)
 (require 'riece-server)
+(require 'riece-mcat)
 
 (defun riece-irc-open-server (server server-name)
   (riece-server-keyword-bind server
@@ -34,8 +35,8 @@
          (coding-system-for-write 'binary)
          process)
       (if (equal server-name "")
-         (message "Connecting to IRC server...")
-       (message "Connecting to %s..." server-name))
+         (message (riece-mcat "Connecting to IRC server..."))
+       (message (riece-mcat "Connecting to %s...") server-name))
       (condition-case error
          (setq process
                (funcall function (riece-server-process-name server-name)
@@ -43,33 +44,37 @@
                         host service))
        (error
         (if (equal server-name "")
-            (message "Connecting to IRC server...failed: %S" error)
-          (message "Connecting to %s...failed: %S" server-name error))
+            (message (riece-mcat "Connecting to IRC server...failed: %S")
+                     error)
+          (message (riece-mcat "Connecting to %s...failed: %S") server-name
+                   error))
         (signal (car error) (cdr error))))
       (if (equal server-name "")
-         (message "Connecting to IRC server...done")
-       (message "Connecting to %s...done" server-name))
+         (message (riece-mcat "Connecting to IRC server...done"))
+       (message (riece-mcat "Connecting to %s...done") server-name))
       (riece-reset-process-buffer process)
       (with-current-buffer (process-buffer process)
        (setq riece-server-name server-name))
       (set-process-sentinel process 'riece-sentinel)
       (set-process-filter process 'riece-filter)
       (if (equal server-name "")
-         (message "Logging in to IRC server...")
-       (message "Logging in to %s..." server-name))
+         (message (riece-mcat "Logging in to IRC server..."))
+       (message (riece-mcat "Logging in to %s...") server-name))
       (if riece-reconnect-with-password        ;password incorrect or not set.
          (unwind-protect
              (setq password
                    (condition-case nil
                        (let (inhibit-quit)
                          (if (equal server-name "")
-                             (riece-read-passwd "Password: ")
-                           (riece-read-passwd (format "Password for %s: "
-                                                      server-name))))
+                             (riece-read-passwd (riece-mcat "Password: "))
+                           (riece-read-passwd
+                            (format (riece-mcat "Password for %s: ")
+                                    server-name))))
                      (quit
                       (if (equal server-name "")
-                          (message "Password: Quit")
-                        (message "Password for %s: Quit" server-name))
+                          (message (riece-mcat "Password: Quit"))
+                        (message (riece-mcat "Password for %s: Quit")
+                                 server-name))
                       'quit)))
            (setq riece-reconnect-with-password nil)))
       (if (eq password 'quit)
@@ -100,15 +105,15 @@
   (let ((server-name (with-current-buffer (process-buffer process)
                       riece-server-name)))
     (if (equal server-name "")
-       (message "Sending QUIT...")
-      (message "Sending QUIT to \"%s\"..." server-name))
+       (message (riece-mcat "Sending QUIT..."))
+      (message (riece-mcat "Sending QUIT to \"%s\"...") server-name))
     (riece-process-send-string process
                               (if message
                                   (format "QUIT :%s\r\n" message)
                                 "QUIT\r\n"))
     (if (equal server-name "")
-       (message "Sending QUIT...done")
-      (message "Sending QUIT to \"%s\"...done" server-name))))
+       (message (riece-mcat "Sending QUIT...done"))
+      (message (riece-mcat "Sending QUIT to \"%s\"...done") server-name))))
 
 (provide 'riece-irc)
 

diff --git a/lisp/riece-mcat-japanese.el b/lisp/riece-mcat-japanese.el
index 91d9e56..6488e89 100644 (file)
--- a/lisp/riece-mcat-japanese.el
+++ b/lisp/riece-mcat-japanese.el
@@ -1,6 +1,25 @@
 ;;; -*- coding: iso-2022-jp -*-
 
 (defconst riece-mcat-japanese-alist
-  '(("Really quit IRC? " . "\e$BK\Ev$K\e(BIRC\e$B$r$d$a$^$9$+\e(B? ")))
+  '(("Sending QUIT...done" . "QUIT \e$B$rAw?.$7$F$$$^$9\e(B...\e$B40N;\e(B")
+    ("Sending QUIT..." . "QUIT \e$B$rAw?.$7$F$$$^$9\e(B...")
+    ("Sending QUIT to \"%s\"...done" . "\"%s\" \e$B$K\e(B QUIT \e$B$rAw?.$7$F$$$^$9\e(B...\e$B40N;\e(B")
+    ("Sending QUIT to \"%s\"..." . "\"%s\" \e$B$K\e(B QUIT \e$B$rAw?.$7$F$$$^$9\e(B...")
+    ("Password: Quit" . "\e$B%Q%9%o!<%I\e(B: \e$BCf;_\e(B")
+    ("Password: " . "\e$B%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 for %s: " . "%s \e$B$N%Q%9%o!<%I\e(B: ")
+    ("Logging in to IRC server..." . "IRC \e$B%5!<%P$K%m%0%$%s$7$F$$$^$9\e(B...")
+    ("Logging in to %s..." . "%s \e$B$K%m%0%$%s$7$F$$$^$9\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")
+    ("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..." . "IRC \e$B%5!<%P$K@\B3$7$F$$$^$9\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...done" . "%s \e$B$K@\B3$7$F$$$^$9\e(B...\e$B40N;\e(B")
+    ("Connecting to %s..." . "%s \e$B$K@\B3$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...done" . "%s \e$B$K%m%0%$%s$7$F$$$^$9\e(B...\e$B40N;\e(B")
+    ("Already registered" . "\e$BEPO?:Q$_$G$9\e(B")
+    ("Really quit IRC? " . "\e$BK\Ev$K\e(BIRC\e$B$r$d$a$^$9$+\e(B? ")))
 
 (provide 'riece-mcat-japanese)