Translate.

diff --git a/lisp/riece-ctcp.el b/lisp/riece-ctcp.el
index 7060735..8e47be0 100644 (file)
--- a/lisp/riece-ctcp.el
+++ b/lisp/riece-ctcp.el
@@ -33,6 +33,7 @@
 (require 'riece-highlight)
 (require 'riece-display)
 (require 'riece-debug)
+(require 'riece-mcat)
 
 (defface riece-ctcp-action-face
   '((((class color)
@@ -104,7 +105,7 @@
        riece-dialogue-buffer)
      (concat
       (riece-concat-server-name
-       (format "CTCP VERSION from %s (%s) to %s"
+       (format (riece-mcat "CTCP VERSION from %s (%s) to %s")
               user
               (riece-strip-user-at-host (riece-prefix-user-at-host prefix))
               (riece-format-identity target-identity t)))
@@ -127,7 +128,7 @@
        riece-dialogue-buffer)
      (concat
       (riece-concat-server-name
-       (format "CTCP PING from %s (%s) to %s"
+       (format (riece-mcat "CTCP PING from %s (%s) to %s")
               user
               (riece-strip-user-at-host (riece-prefix-user-at-host prefix))
               (riece-format-identity target-identity t)))
@@ -163,7 +164,7 @@
        riece-dialogue-buffer)
      (concat
       (riece-concat-server-name
-       (format "CTCP CLIENTINFO from %s (%s) to %s"
+       (format (riece-mcat "CTCP CLIENTINFO from %s (%s) to %s")
               user
               (riece-strip-user-at-host (riece-prefix-user-at-host prefix))
               (riece-format-identity target-identity t)))
@@ -204,7 +205,8 @@
         (time (format-time-string "%c")))
     (riece-send-string
      (format "NOTICE %s :\1TIME %s\1\r\n" user time))
-    (riece-insert-change buffer (format "CTCP TIME from %s\n" user))
+    (riece-insert-change buffer (format (riece-mcat "CTCP TIME from %s\n")
+                                       user))
     (riece-insert-change
      (if (and riece-channel-buffer-mode
              (not (eq buffer riece-channel-buffer)))
@@ -212,7 +214,7 @@
        riece-dialogue-buffer)
      (concat
       (riece-concat-server-name
-       (format "CTCP TIME from %s (%s) to %s"
+       (format (riece-mcat "CTCP TIME from %s (%s) to %s")
               user
               (riece-strip-user-at-host (riece-prefix-user-at-host prefix))
               (riece-format-identity target-identity t)))
@@ -254,7 +256,7 @@
    (list riece-dialogue-buffer riece-others-buffer)
    (concat
     (riece-concat-server-name
-     (format "CTCP VERSION for %s (%s) = %s"
+     (format (riece-mcat "CTCP VERSION for %s (%s) = %s")
             (riece-prefix-nickname prefix)
             (riece-strip-user-at-host (riece-prefix-user-at-host prefix))
             string))
@@ -268,7 +270,7 @@
      (list riece-dialogue-buffer riece-others-buffer)
      (concat
       (riece-concat-server-name
-       (format "CTCP PING for %s (%s) = %d sec"
+       (format (riece-mcat "CTCP PING for %s (%s) = %d sec")
               (riece-prefix-nickname prefix)
               (riece-strip-user-at-host (riece-prefix-user-at-host prefix))
               elapsed))
@@ -279,7 +281,7 @@
    (list riece-dialogue-buffer riece-others-buffer)
    (concat
     (riece-concat-server-name
-     (format "CTCP CLIENTINFO for %s (%s) = %s"
+     (format (riece-mcat "CTCP CLIENTINFO for %s (%s) = %s")
             (riece-prefix-nickname prefix)
             (riece-strip-user-at-host (riece-prefix-user-at-host prefix))
             string))
@@ -290,7 +292,7 @@
    (list riece-dialogue-buffer riece-others-buffer)
    (concat
     (riece-concat-server-name
-     (format "CTCP TIME for %s (%s) = %s"
+     (format (riece-mcat "CTCP TIME for %s (%s) = %s")
             (riece-prefix-nickname prefix)
             (riece-strip-user-at-host (riece-prefix-user-at-host prefix))
             string))
@@ -299,7 +301,7 @@
 (defun riece-command-ctcp-version (target)
   (interactive
    (list (riece-completing-read-identity
-         "Channel/User: "
+         (riece-mcat "Channel/User: ")
          (riece-get-identities-on-server (riece-current-server-name)))))
   (riece-send-string (format "PRIVMSG %s :\1VERSION\1\r\n"
                             (riece-identity-prefix target))))
@@ -307,7 +309,7 @@
 (defun riece-command-ctcp-ping (target)
   (interactive
    (list (riece-completing-read-identity
-         "Channel/User: "
+         (riece-mcat "Channel/User: ")
          (riece-get-identities-on-server (riece-current-server-name)))))
   (riece-send-string (format "PRIVMSG %s :\1PING\1\r\n"
                             (riece-identity-prefix target)))
@@ -316,7 +318,7 @@
 (defun riece-command-ctcp-clientinfo (target)
   (interactive
    (list (riece-completing-read-identity
-         "Channel/User: "
+         (riece-mcat "Channel/User: ")
          (riece-get-identities-on-server (riece-current-server-name)))))
   (riece-send-string (format "PRIVMSG %s :\1CLIENTINFO\1\r\n"
                             (riece-identity-prefix target))))
@@ -325,7 +327,7 @@
   (interactive
    (list (if current-prefix-arg
             (riece-completing-read-identity
-             "Channel/User: "
+             (riece-mcat "Channel/User: ")
              (riece-get-identities-on-server (riece-current-server-name)))
           riece-current-channel)
         (let (message)
@@ -333,8 +335,9 @@
           (setq message (buffer-substring (point)
                                           (progn (end-of-line) (point))))
           (if (equal message "")
-              (read-string "Action: ")
-            (prog1 (read-from-minibuffer "Action: " (cons message 0))
+              (read-string (riece-mcat "Action: "))
+            (prog1 (read-from-minibuffer (riece-mcat "Action: ")
+                                         (cons message 0))
               (let ((next-line-add-newlines t))
                 (next-line 1)))))))
   (if (equal action "")
@@ -363,7 +366,7 @@
 (defun riece-command-ctcp-time (target)
   (interactive
    (list (riece-completing-read-identity
-         "Channel/User: "
+         (riece-mcat "Channel/User: ")
          (riece-get-identities-on-server (riece-current-server-name)))))
   (riece-send-string (format "PRIVMSG %s :\1TIME\1\r\n"
                             (riece-identity-prefix target))))

diff --git a/lisp/riece-mcat-japanese.el b/lisp/riece-mcat-japanese.el
index 52fd6b3..257a0a4 100644 (file)
--- a/lisp/riece-mcat-japanese.el
+++ b/lisp/riece-mcat-japanese.el
@@ -50,6 +50,7 @@
     ("%s will be insinuated.  Continue? " . "%s \e$B$OAH$_9~$^$l$F$$$^$;$s!#B39T$7$^$9$+\e(B? ")
     ("%s: %s users, topic: %s" . "%s: %s \e$B?M!"%H%T%C%/\e(B: %s\n")
     ("(no description)" . "(\e$B@bL@$J$7\e(B)")
+    ("Action: " . "\e$B%"%/%7%g%s\e(B: ")
     ("Add-on %S disabled" . "\e$B%"%I%*%s\e(B %S \e$B$,L58z$K$J$j$^$7$?\e(B")
     ("Add-on %S enabled" . "\e$B%"%I%*%s\e(B %S \e$B$,M-8z$K$J$j$^$7$?\e(B")
     ("Add-on %S is already disabled" . "\e$B%"%I%*%s\e(B %S \e$B$O4{$KL58z$G$9\e(B")
@@ -64,9 +65,19 @@
     ("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")
+    ("CTCP CLIENTINFO for %s (%s) = %s" . "%s (%s) \e$B$N\e(B CTCP CLIENTINFO = %s")
+    ("CTCP CLIENTINFO from %s (%s) to %s" . "%s (%s) \e$B$,\e(B %s \e$B$K\e(B CTCP CLIENTINFO")
+    ("CTCP PING for %s (%s) = %d sec" . "%s (%s) \e$B$N\e(B CTCP PING = %d \e$BIC\e(B")
+    ("CTCP PING from %s (%s) to %s" . "%s (%s) \e$B$,\e(B %s \e$B$K\e(B CTCP PING")
+    ("CTCP TIME for %s (%s) = %s" . "%s (%s) \e$B$N\e(B CTCP TIME = %s")
+    ("CTCP TIME from %s\n" . "%s \e$B$+$i\e(B CTCP TIME\n")
+    ("CTCP TIME from %s (%s) to %s" . "%s (%s) \e$B$,\e(B %s \e$B$K\e(B CTCP TIME")
+    ("CTCP VERSION for %s (%s) = %s" . "%s (%s) \e$B$N\e(B CTCP VERSION = %s")
+    ("CTCP VERSION from %s (%s) to %s" . "%s (%s) \e$B$,\e(B %s \e$B$K\e(B CTCP VERSION")
     ("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: ")
+    ("Channel/User: " . "\e$B%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...")