diff -ruN ./ZWiki-0.11.0JP001/Parents.py ./ZWiki/Parents.py
--- ./ZWiki-0.11.0JP001/Parents.py	Mon Oct 14 15:33:12 2002
+++ ./ZWiki/Parents.py	Fri Oct 11 08:59:49 2002
@@ -155,7 +155,7 @@
                                         realid=self.pageWithName(myid).id())
         
         return '<small><ul><a href="%s/map#%s" title="¤³¤Î¥Ú¡¼¥¸¤Î´ØϢʸ½ñ¤òɽ¼¨(show site contents centered on this page)" accesskey="c">%s ����ƥ�ĥޥå�(contents)</a>\n' % \
-               (self.page_url(), quote(self.title_or_id()), titletxt) + \
+               (self.page_url(), quote_i(self.title_or_id()), titletxt) + \
                hierarchy + '\n</ul></small>'
 
     def deepappend(self, nesting, pageid):
@@ -219,7 +219,7 @@
                     linktitle = ''
                 singletons.append(\
                     '<a href="%s/%s" name="%s" title="%s">%s</a>'\
-                    % (rel, quote(i), quote(i),
+                    % (rel, quote_i(i), quote(i),
                        linktitle,
                        i))
             else:
@@ -269,8 +269,8 @@
                         except:
                             linktitle = ''
                         _got.append(\
-                            '%s <li><a href="%s/%s" name="%s" title="%s">%s</a> <-- you are here'
-                            % (indent, rel, quote(n[0]), quote(n[0]),
+                            '%s <li><a href="%s/%s" name="%s" title="%s">%s</a> <-- ������(you are here)'
+                            % (indent, rel, quote_i(n[0]), quote(n[0]),
                                linktitle,
                                nodenm))
                 else:
@@ -281,7 +281,7 @@
                         linktitle = ''
                     _got.append(\
                         '%s <li><a href="%s/%s" name="%s" title="%s">%s</a>'
-                        % (indent, rel, quote(n[0]), quote(n[0]),
+                        % (indent, rel, quote_i(n[0]), quote(n[0]),
                            linktitle,
                            nodenm))
                 if len(n) > 1:
@@ -310,7 +310,7 @@
                                         linktitle = ''
                                     _got.append(\
                                         '%s <li><a href="%s/%s" name="%s" title="%s">%s</a> <-- ������(you are here)'
-                                        % (indent, rel, quote(i), quote(i),
+                                        % (indent, rel, quote_i(i), quote(i),
                                            linktitle,
                                            inm))
                             else:
@@ -321,7 +321,7 @@
                                     linktitle = ''
                                 _got.append(\
                                     '%s <li><a href="%s/%s" name="%s" title="%s">%s</a>'
-                                    % (indent, rel, quote(i), quote(i),
+                                    % (indent, rel, quote_i(i), quote(i),
                                        linktitle,
                                        inm))
                     _got.append("</ul>")
@@ -345,7 +345,7 @@
                             linktitle = ''
                         _got.append(\
                             '%s <li><a href="%s/%s" name="%s" title="%s">%s</a> <-- ������(you are here)'
-                            % (indent, rel, quote(n), quote(n),
+                            % (indent, rel, quote_i(n), quote(n),
                                linktitle,
                                inm))
                 else:
@@ -356,7 +356,7 @@
                         linktitle = ''
                     _got.append(\
                         '%s <li><a href="%s/%s" name="%s" title="%s">%s</a>'
-                        % (indent, rel, quote(n), quote(n),
+                        % (indent, rel, quote_i(n), quote(n),
                            linktitle,
                            inm))
 
@@ -543,3 +543,45 @@
     got.insert(0, page)
     return got
 
+def quote_i(u=''):
+    """Enable to use for wiki name as Japanese language.
+       by Nobuyuki Koyoshi in Japan. 2002-10-10
+    """
+    ul=quote_x(u)
+    if u==ul:
+        return u
+    else:
+        if ul[0:1]=='_' and not u[0:1]=='_':
+            return 'X%s' % (ul)
+        else:
+            return ul
+
+always_safe = ('ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+               'abcdefghijklmnopqrstuvwxyz'
+               '0123456789' '_.-')
+_fast_safe_test = always_safe + '/'
+_fast_safe = None
+
+def quote_x(s, safe = '/'):
+    safe = always_safe + safe
+    if _fast_safe_test == safe:
+        return _fast_quote_x(s)
+    res = list(s)
+    for i in range(len(res)):
+        c = res[i]
+        if c not in safe:
+            res[i] = '_%02x' % ord(c)
+    return ''.join(res)
+
+def _fast_quote_x(s):
+    global _fast_safe
+    if _fast_safe is None:
+        _fast_safe = {}
+        for c in _fast_safe_test:
+            _fast_safe[c] = c
+    res = list(s)
+    for i in range(len(res)):
+        c = res[i]
+        if not _fast_safe.has_key(c):
+            res[i] = '_%02x' % ord(c)
+    return ''.join(res)
diff -ruN ./ZWiki-0.11.0JP001/templates/defaults/editform.dtml ./ZWiki/templates/defaults/editform.dtml
--- ./ZWiki-0.11.0JP001/templates/defaults/editform.dtml	Mon Oct 14 15:33:13 2002
+++ ./ZWiki/templates/defaults/editform.dtml	Sat Oct 12 01:02:12 2002
@@ -22,9 +22,10 @@
 <dtml-if "REQUEST.get('zwiki_showlogo',1)">
 <a href="&dtml-wiki_url;/" title="go to home page" accesskey="1"><img src="/misc_/ZWiki/ZWikiPage_icon.gif" height=32 width=32 border=0 valign="bottom" alt=" "></a>
 </dtml-if>
+&dtml-id;��
 <dtml-if "action == 'Create'">
-+����(Creating)<dtml-else>
-+�Խ�(Editing)</dtml-if> &dtml-id;
+����(Creating<dtml-else>
+�Խ�(Editing</dtml-if> &dtml-id;)
 </h1>
 </td>
 </tr>
diff -ruN ./ZWiki-0.11.0JP001/templates/defaults/subscribeform.dtml ./ZWiki/templates/defaults/subscribeform.dtml
--- ./ZWiki-0.11.0JP001/templates/defaults/subscribeform.dtml	Mon Oct 14 15:33:13 2002
+++ ./ZWiki/templates/defaults/subscribeform.dtml	Mon Oct 14 15:22:55 2002
@@ -1,6 +1,6 @@
 <HTML>
 <HEAD>
-<TITLE><dtml-var "aq_parent.title"><dtml-var id> subscription</TITLE>
+<TITLE><dtml-var "aq_parent.title"><dtml-var id> �� ������Ͽ(subscription)</TITLE>
 <META NAME="ROBOTS" CONTENT="NOINDEX,NOFOLLOW">
 </HEAD>
 <BODY BGCOLOR="#FFFFFF">
@@ -13,9 +13,9 @@
 <td valign="bottom">
 <h1>
 <dtml-if "REQUEST.get('zwiki_showlogo',1)">
-<a href="&dtml-wiki_url;/" title="go to home page" accesskey="1"><img src="/misc_/ZWiki/ZWikiPage_icon.gif" height=32 width=32 border=0 valign="bottom" alt="home"></a>
+<a href="&dtml-wiki_url;/" title="¥È¥Ã¥×¥Ú¡¼¥¸¤Ø(go to home page)" accesskey="1"><img src="/misc_/ZWiki/ZWikiPage_icon.gif" height=32 width=32 border=0 valign="bottom" alt="home"></a>
 </dtml-if>
-Mail subscription
+�᡼����Ͽ(Mail subscription)
 </h1>
 </td>
 </tr>
@@ -30,6 +30,11 @@
 
 <FORM METHOD="POST" ACTION="&dtml-page_url;/subscribeform" ENCTYPE="multipart/form-data">
 
+�����Υڡ����ޤ��Ϥ���Wiki���������Τ��Ф����ɤ���Ͽ������ޤ���
+ ��Ͽ�Ԥ��Żҥ᡼���ͳ�ǡ������ȤΥ��ԡ���������뤳�Ȥˤʤ�ޤ�
+(���ε�ǽ�ϡ������ȴ����Ԥ������ͭ���ˤ��ʤ��¤����ޤ���)��
+��Ͽ���ʤ��ʤ�С�<a href="&dtml-page_url;">&dtml-id;</a>�����ޤ��礦��<br>
+
 You can subscribe to this page or to the whole wiki.
 Subscribers receive a copy of comments via email
 (but not general edits, unless enabled by the site admin).
@@ -37,7 +42,7 @@
 
 <br><br>
 
-Your email address:
+���ʤ���Email���ɥ쥹(Your email address):
 <input name="email" type="text" value="<dtml-var email missing>" size=30>
 <input name="emailchanged" type="hidden" value="1">
 <INPUT TYPE="submit" NAME="../subscribeform:method" VALUE=" Change ">
@@ -53,6 +58,14 @@
 bgcolor="#ff7777"
 </dtml-if>
 >
+���ʤ��ϡ����Υڡ�����
+<dtml-if "isSubscriber(email)">
+<b>��Ͽ��</b>
+<dtml-else>
+̤��Ͽ
+</dtml-if>
+�Ǥ���<br>
+
 You are currently
 <dtml-if "isSubscriber(email)">
 <b>subscribed</b><br>
@@ -62,9 +75,9 @@
 to this page.
 <br>
 <dtml-if "isSubscriber(email)">
-<INPUT TYPE="submit" NAME="../unsubscribe:method" VALUE=" Unsubscribe from &dtml-id; " style="font-weight:bold">
+<INPUT TYPE="submit" NAME="../unsubscribe:method" VALUE=" &dtml-id;¤Ø¤ÎÅÐÏ¿¤Î²ò½ü(Unsubscribe from &dtml-id;) " style="font-weight:bold">
 <dtml-else>
-<INPUT TYPE="submit" NAME="../subscribe:method" VALUE=" Subscribe to &dtml-id; " style="font-weight:bold">
+<INPUT TYPE="submit" NAME="../subscribe:method" VALUE=" &dtml-id;¤Ø¤ÎÅÐÏ¿(Subscribe to) &dtml-id; " style="font-weight:bold">
 </dtml-if>
 <br>
 </td>
@@ -75,6 +88,13 @@
 bgcolor="#ff7777"
 </dtml-if>
 >
+���ʤ��ϡ�����Wiki���������Τ��Ф�
+<dtml-if "isWikiSubscriber(email)">
+<b>��Ͽ���Ƥ��ޤ�</b>
+<dtml-else>
+��Ͽ���Ƥ��ޤ���
+</dtml-if>
+��<br>
 You are currently
 <dtml-if "isWikiSubscriber(email)">
 <b>subscribed</b><br>
@@ -84,9 +104,9 @@
 to the whole wiki.
 <br>
 <dtml-if "isWikiSubscriber(email)">
-<INPUT TYPE="submit" NAME="../wikiUnsubscribe:method" VALUE=" Unsubscribe from the whole wiki " style="font-weight:bold">
+<INPUT TYPE="submit" NAME="../wikiUnsubscribe:method" VALUE="Wiki¤Ø¤ÎÅÐÏ¿²ò½ü(Unsubscribe from the whole wiki)" style="font-weight:bold">
 <dtml-else>
-<INPUT TYPE="submit" NAME="../wikiSubscribe:method" VALUE=" Subscribe to the whole wiki " style="font-weight:bold">
+<INPUT TYPE="submit" NAME="../wikiSubscribe:method" VALUE="Wiki¤Ø¤ÎÅÐÏ¿(Subscribe to the whole wiki)" style="font-weight:bold">
 </dtml-if>
 <br>
 </td>
@@ -96,13 +116,14 @@
 <td>
 <dtml-in "otherPageSubscriptionsFor(email)" prefix=x>
 <dtml-if sequence-start>
-You are subscribed to these other pages: <br>
+���ʤ�����Ͽ���Ƥ��뤽��¾�Υڡ���
+(You are subscribed to these other pages): <br>
 </dtml-if>
 <a href="../&dtml.url_quote-x_sequence_item;/subscribeform?email=&dtml.url_quote-email;"
 ><dtml-var x_sequence_item></a>
 <dtml-else>
 <dtml-comment>
-You have no other page subscriptions.
+¾�ˡ����ʤ�����Ͽ���Ƥ���ڡ����Ϥ���ޤ���<br>(You have no other page subscriptions.)
 </dtml-comment>
 </dtml-in>
 </td>
@@ -114,7 +135,7 @@
 <tr>
 <td valign="top" width="50%"
 <br>
-<dtml-var id> subscribers:
+<dtml-var id>�ؤ���Ͽ��(subscribers):
 <br>
 <dtml-comment>
 <dtml-let n="subscriberCount()">
@@ -131,7 +152,7 @@
 </td>
 <td valign="top" width="50%"
 <br>
-wiki subscribers:
+Wiki�ؤ���Ͽ��(wiki subscribers):
 <br>
 <dtml-comment>
 <dtml-let n="wikiSubscriberCount()">