Translate.

diff --git a/lisp/riece-400.el b/lisp/riece-400.el
index 6dc4e43..6386375 100644 (file)
--- a/lisp/riece-400.el
+++ b/lisp/riece-400.el
@@ -26,6 +26,7 @@
 
 (require 'riece-globals)
 (require 'riece-misc)
+(require 'riece-mcat)
 
 (eval-when-compile
   (autoload 'riece-default-handle-numeric-reply "riece-handle"))
@@ -44,7 +45,7 @@
   "ERR_ERRONEUSNICKNAME        \"<nick> :Erroneous nickname\"."
   (let ((nickname
         (riece-handle-read-string
-         (format "Erroneous nickname \"%s\".  Choose a new one: "
+         (format (riece-mcat "Erroneous nickname \"%s\".  Choose a new one: ")
                  (car (riece-split-parameters string))))))
     (if nickname
        (riece-send-string (format "NICK %s\r\n" nickname)))))
@@ -53,14 +54,14 @@
   "ERR_NICKNAMEINUSE \"<nick> :Nickname is already in use\"."
   (let ((nickname
         (riece-handle-read-string
-         (format "Nickname \"%s\" already in use.  Choose a new one: "
+         (format (riece-mcat "Nickname \"%s\" already in use.  Choose a new one: ")
                  (car (riece-split-parameters string))))))
     (if nickname
        (riece-send-string (format "NICK %s\r\n" nickname)))))
 
 (defun riece-handle-464-message (prefix number name string)
   "ERR_PASSWDMISMATCH \":Password incorrect\"."
-  (message "Password incorrect from %s." prefix)
+  (message (riece-mcat "Password incorrect from %s.") prefix)
   (setq riece-reconnect-with-password t))
 
 (defun riece-handle-475-message (prefix number name string)
@@ -69,15 +70,14 @@
         (channel-identity (riece-make-identity (car parameters)
                                                riece-server-name))
         key)
-    (message "%s: %s" (car parameters) (nth 1 parameters))
     (setq key
          (condition-case nil
              (let (inhibit-quit)
                (riece-read-passwd
-                (format "Key for %s: "
+                (format (riece-mcat "Key for %s: ")
                         (riece-format-identity channel-identity t))))
            (quit
-            (message "Key for %s: Quit"
+            (message (riece-mcat "Key for %s: Quit")
                      (riece-format-identity channel-identity t))
             'quit)))
     (unless (eq key 'quit)

diff --git a/lisp/riece-display.el b/lisp/riece-display.el
index fbead8b..96c32ff 100644 (file)
--- a/lisp/riece-display.el
+++ b/lisp/riece-display.el
@@ -29,6 +29,7 @@
 (require 'riece-misc)
 (require 'riece-layout)
 (require 'riece-signal)
+(require 'riece-mcat)
 
 (autoload 'derived-mode-class "derived")
 
@@ -280,7 +281,7 @@ Local to the buffer in `riece-buffer-list'.")
   (setq riece-channel-indicator
        (if riece-current-channel
            (riece-format-identity riece-current-channel)
-         "None")))
+         (riece-mcat "None"))))
 
 (defun riece-update-long-channel-indicator ()
   (setq riece-long-channel-indicator
@@ -292,7 +293,7 @@ Local to the buffer in `riece-buffer-list'.")
                  riece-current-channel
                  (riece-format-identity riece-current-channel)))
              (riece-format-identity riece-current-channel))
-         "None")))
+         (riece-mcat "None"))))
 
 (defun riece-format-identity-for-channel-list-indicator (index identity)
   (or (run-hook-with-args-until-success
@@ -330,7 +331,7 @@ Local to the buffer in `riece-buffer-list'.")
          (setq pointer (cdr (cdr pointer))))
        (setq riece-channel-list-indicator
              (riece-normalize-modeline-string riece-channel-list-indicator)))
-    (setq riece-channel-list-indicator "No channel")))
+    (setq riece-channel-list-indicator (riece-mcat "No channel"))))
 
 (defun riece-update-status-indicators ()
   (let ((server-name (riece-current-server-name)))
@@ -421,10 +422,9 @@ Local to the buffer in `riece-buffer-list'.")
       (riece-channel-mode)
       (let (buffer-read-only)
        (riece-insert-info (current-buffer)
-                          (concat "Created on "
+                          (format (riece-mcat "Created on %s\n")
                                   (funcall riece-format-time-function
-                                           (current-time))
-                                  "\n"))
+                                           (current-time))))
        (run-hook-with-args 'riece-channel-buffer-create-functions identity)))
     (current-buffer)))
 

diff --git a/lisp/riece-log.el b/lisp/riece-log.el
index 93a4ed9..624115b 100644 (file)
--- a/lisp/riece-log.el
+++ b/lisp/riece-log.el
@@ -31,6 +31,7 @@
 
 (require 'riece-message)
 (require 'riece-button)
+(require 'riece-mcat)
 
 (defgroup riece-log nil
   "Save IRC logs."
@@ -237,8 +238,9 @@ If LINES is t, insert today's logs entirely."
   (when riece-log-flashback
     (riece-insert-info (current-buffer)
                       (if (eq riece-log-flashback t)
-                          "Recent messages of the day:\n"
-                        (format "Recent messages up to %d lines:\n"
+                          (riece-mcat "Recent messages of the day:\n")
+                        (format (riece-mcat
+                                 "Recent messages up to %d lines:\n")
                                 riece-log-flashback)))
     (let (buffer-read-only
          (point (goto-char (point-max))))

diff --git a/lisp/riece-mcat-japanese.el b/lisp/riece-mcat-japanese.el
index f2954eb..5764f20 100644 (file)
--- a/lisp/riece-mcat-japanese.el
+++ b/lisp/riece-mcat-japanese.el
@@ -42,23 +42,35 @@
     ("Connecting to IRC server..." . "IRC \e$B%5!<%P$K@\B3$7$F$$$^$9\e(B...")
     ("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")
+    ("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: ")
+    ("Key for %s: " . "%s \e$B$N%-!<\e(B: ")
+    ("Key for %s: Quit" . "%s \e$B$N%-!<\e(B: \e$BCf;_\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")
     ("Mode by %s: %s\n" . "%s \e$B$K$h$k%b!<%I@_Dj\e(B: %s\n")
     ("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")
+    ("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 channel" . "\e$B%A%c%s%M%k$J$7\e(B")
+    ("None" . "\e$B$J$7\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? ")
+    ("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...")
     ("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..." . "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")
     ("Topic by %s: %s\n" . "%s \e$B$K$h$k%H%T%C%/@_Dj\e(B: %s\n")
-    ("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]")))
 
 (provide 'riece-mcat-japanese)
 

diff --git a/lisp/riece.el b/lisp/riece.el
index bf38673..75356bd 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -286,7 +286,8 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
        (riece-insinuate-addon (car (car pointer)) riece-debug)
        (setq pointer (cdr pointer))))
     (if (or confirm (null riece-server))
-       (setq riece-server (completing-read "Server: " riece-server-alist)))
+       (setq riece-server (completing-read (riece-mcat "Server: ")
+                                           riece-server-alist)))
     (if (stringp riece-server)
        (setq riece-server (riece-server-name-to-server riece-server)))
     (riece-create-buffers)
@@ -316,7 +317,7 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
          (setq pointer (cdr pointer))))
       (run-hooks 'riece-startup-hook)
       (message "%s" (substitute-command-keys
-                    "Type \\[describe-mode] for help")))))
+                    (riece-mcat "Type \\[describe-mode] for help"))))))
 
 (defun riece-exit ()
   (if riece-save-variables-are-dirty
@@ -333,8 +334,8 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
        riece-channel-buffer nil
        riece-channel-buffer-alist nil
        riece-user-indicator nil
-       riece-long-channel-indicator "None"
-       riece-channel-list-indicator "No channel"
+       riece-long-channel-indicator (riece-mcat "None")
+       riece-channel-list-indicator (riece-mcat "No channel")
        riece-away-indicator "-"
        riece-operator-indicator "-"
        riece-channel-status-indicator "-"