From 29b0e919ccb5051e97c5d023266c077ece957028 Mon Sep 17 00:00:00 2001 From: ueno Date: Sun, 28 Jan 2007 03:11:17 +0000 Subject: [PATCH] Translate. --- lisp/riece-400.el | 12 ++++++------ lisp/riece-display.el | 12 ++++++------ lisp/riece-log.el | 6 ++++-- lisp/riece-mcat-japanese.el | 14 +++++++++++++- lisp/riece.el | 9 +++++---- 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/lisp/riece-400.el b/lisp/riece-400.el index 6dc4e43..6386375 100644 --- 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 \" :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 \" :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 --- 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 --- 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 --- a/lisp/riece-mcat-japanese.el +++ b/lisp/riece-mcat-japanese.el @@ -42,23 +42,35 @@ ("Connecting to IRC server..." . "IRC サーバに接続しています...") ("Connecting to IRC server...done" . "IRC サーバに接続しています...完了") ("Connecting to IRC server...failed: %S" . "IRC サーバに接続しています...失敗: %S") + ("Created on %s\n" . "%s に作成されました\n") + ("Erroneous nickname \"%s\". Choose a new one: " . "謝ったニックネーム \"%s\"。新しいニックネーム: ") + ("Key for %s: " . "%s のキー: ") + ("Key for %s: Quit" . "%s のキー: 中止") ("Logging in to %s..." . "%s にログインしています...") ("Logging in to %s...done" . "%s にログインしています...完了") ("Logging in to IRC server..." . "IRC サーバにログインしています...") ("Logging in to IRC server...done" . "IRC サーバにログインしています...完了") ("Mode by %s: %s\n" . "%s によるモード設定: %s\n") ("Mode on %s by %s: %s" . "%s のモードが %s により設定されました: %s") + ("Nickname \"%s\" already in use. Choose a new one: " . "ニックネーム \"%s\" は既に使用されています。新しいニックネーム: ") + ("No channel" . "チャンネルなし") + ("None" . "なし") ("Password for %s: " . "%s のパスワード: ") ("Password for %s: Quit" . "%s のパスワード: 中止") + ("Password incorrect from %s." . "%s のパスワードが不正です。") ("Password: " . "パスワード: ") ("Password: Quit" . "パスワード: 中止") ("Really quit IRC? " . "本当に IRC をやめますか? ") + ("Recent messages of the day:\n" . "最近のメッセージ(今日中):\n") + ("Recent messages up to %d lines:\n" . "最近のメッセージ(%d行):\n") ("Sending QUIT to \"%s\"..." . "\"%s\" に QUIT を送信しています...") ("Sending QUIT to \"%s\"...done" . "\"%s\" に QUIT を送信しています...完了") ("Sending QUIT..." . "QUIT を送信しています...") ("Sending QUIT...done" . "QUIT を送信しています...完了") + ("Server: " . "サーバ") ("Topic by %s: %s\n" . "%s によるトピック設定: %s\n") - ("Topic on %s by %s: %s" . "%s のトピックが %s により設定されました: %s"))) + ("Topic on %s by %s: %s" . "%s のトピックが %s により設定されました: %s") + ("Type \\[describe-mode] for help" . "ヘルプを見るには \\[describe-mode]"))) (provide 'riece-mcat-japanese) diff --git a/lisp/riece.el b/lisp/riece.el index bf38673..75356bd 100644 --- 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 "-" -- 1.7.10.4