diff -ruN ./ZWiki-0.11.0JP003/Parents.py ./ZWiki/Parents.py
--- ./ZWiki-0.11.0JP003/Parents.py	Sun Oct 27 02:02:28 2002
+++ ./ZWiki/Parents.py	Sat Oct 26 18:03:14 2002
@@ -1,7 +1,7 @@
 ######################################################################
 # zwiki page parenting functionality
 
-from string import join
+from string import join,upper
 from types import *
 from urllib import quote
 import Acquisition
@@ -549,12 +549,12 @@
     """
     ul=quote_x(u)
     if u==ul:
-        return u
+        return upper(ul[0])+ul[1:]
     else:
         if ul[0:1]=='_' and not u[0:1]=='_':
             return 'X%s' % (ul)
         else:
-            return ul
+            return upper(ul[0])+ul[1:]
 
 always_safe = ('ABCDEFGHIJKLMNOPQRSTUVWXYZ'
                'abcdefghijklmnopqrstuvwxyz'
diff -ruN ./ZWiki-0.11.0JP003/ZWikiPage.py ./ZWiki/ZWikiPage.py
--- ./ZWiki-0.11.0JP003/ZWikiPage.py	Sun Oct 27 02:02:28 2002
+++ ./ZWiki/ZWikiPage.py	Sun Oct 27 13:45:40 2002
@@ -912,7 +912,9 @@
         #    page = self.folder()[unquote(pagename)]
         # I think they all need unquoting
         # also allow for differing wikiname & id now
-        page = self.pageWithName(unquote_i(pagename))
+        page = self.pageWithName(unquote_i(pagename,0))
+        if not page:
+            page = self.pageWithName(unquote_i(pagename,1))
         # bah!!!
         if page:
             linktitle = page.linkTitle()
@@ -1651,7 +1653,7 @@
         'APageWith_21'
         >>> p.canonicalIdFrom('a_page')
         'A_5fpage'
-        >>> p.canonicalIdFrom('��age')
+        >>> p.canonicalIdFrom('?Page')
         'X_c3Page'
         >>> p.canonicalIdFrom('_c3Page')
         'X_5fc3Page'
@@ -3447,13 +3449,17 @@
 #verbs for methods and nouns for data attributes."
 
 
-def unquote_i(s):
+def unquote_i(s,u=0):
     """unquote('abc%20def') -> 'abc def'."""
     mychr = chr
     myatoi = int
     if s[0:2]=='X_': s=s[1:]
     pat=re.compile(r'(X_+[0-9a-f]+[0-9a-f]+)')
+    pat2=re.compile(r'[A-Z]+')
     if re.match(pat,s[0:2]): s=s[1:]
+    else:
+        if u==1:
+            if re.match(pat2,s[0:1]):s=lower(s[0])+s[1:]
     list = s.split('_')
     res = [list[0]]
     myappend = res.append
diff -ruN ./ZWiki-0.11.0JP003/templates/defaults/backlinks.dtml ./ZWiki/templates/defaults/backlinks.dtml
--- ./ZWiki-0.11.0JP003/templates/defaults/backlinks.dtml	Sun Oct 27 02:02:30 2002
+++ ./ZWiki/templates/defaults/backlinks.dtml	Sun Oct 27 00:02:39 2002
@@ -49,7 +49,7 @@
 <dtml-if zwiki_showhierarchy>
 <p>
 <form action="reparent">
-���Υڡ����οƤ����ꤷ������ƥ�ġ��ĥ꡼��ΰ����դ�������ޤ���
+���Υڡ����οƤ����ꤷ������ƥ�ġ��ޥå׾�ΰ����դ�������ޤ���
 �ܥå����Υ����å��ޤ����̤Υڡ���̾�����ϸ塢�ֿƥڡ�������(Reparent)�ץܥ���򥯥�å����ޤ���
 �̾�ϡ���ĤοƤǽ�ʬ�Ǥ��礦��
 <br>(You can also set this page's <em>parent(s)</em>, to locate it within the
@@ -103,7 +103,7 @@
 <dtml-if zwiki_showhierarchy>
 <p>
 <form action="reparent">
-���Υڡ����οƤ����ꤷ������ƥ�ġ��ĥ꡼��ΰ����դ�������ޤ���
+���Υڡ����οƤ����ꤷ������ƥ�ġ��ޥå׾�ΰ����դ�������ޤ���
 �ܥå����Υ����å��ޤ����̤Υڡ���̾�����ϸ塢�ֿƥڡ�������(Reparent)�ץܥ���򥯥�å����ޤ���
 �̾�ϡ���ĤοƤǽ�ʬ�Ǥ��礦��
 <br>(You can also set this page's <em>parent(s)</em>, to locate it within the
diff -ruN ./ZWiki-0.11.0JP003/templates/defaults/editform.dtml ./ZWiki/templates/defaults/editform.dtml
--- ./ZWiki-0.11.0JP003/templates/defaults/editform.dtml	Sun Oct 27 02:02:30 2002
+++ ./ZWiki/templates/defaults/editform.dtml	Sun Oct 27 15:34:15 2002
@@ -3,7 +3,7 @@
 <META HTTP-EQUIV="Content-Type" Content="text/html; charset=EUC-JP">
 <META name="Content-Language" content="ja">
 <TITLE><dtml-var "aq_parent.title">
-<dtml-if "action == 'Create'">
+<dtml-if "action == '����'">
 ����(creating)<dtml-else>
 �Խ�(editing)</dtml-if> &dtml-id;
 </TITLE>
@@ -23,7 +23,7 @@
 <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'">
+<dtml-if "action == 'ºîÀ®'">
 ����(Creating<dtml-else>
 �Խ�(Editing</dtml-if> &dtml-id;)
 </h1>
@@ -50,7 +50,13 @@
 &nbsp;
 </td>
 <td valign="top" align="right" bgcolor="#dddddd">
-<b><INPUT TYPE="submit" NAME="edit:method" VALUE=" <dtml-var title_or_id> ¤Î <dtml-var action> " tabindex="2" style="font-weight:bold" accesskey="s"></b>
+<b>
+<dtml-if page>
+<INPUT TYPE="submit" NAME="edit:method" VALUE=" ¡Ö<dtml-var page>¡× ¤Î <dtml-var action> " tabindex="2" style="font-weight:bold" accesskey="s">
+<dtml-else>
+<INPUT TYPE="submit" NAME="edit:method" VALUE=" ¡Ö<dtml-var title_or_id>¡× ¤Î <dtml-var action> " tabindex="2" style="font-weight:bold" accesskey="s">
+</dtml-if>
+</b>
 </td>
 </tr>
 
@@ -128,7 +134,7 @@
 </dtml-if>
 
 <dtml-if usingRegulations>
-<dtml-let creating="_.has_key('action') and action == 'Create'"
+<dtml-let creating="_.has_key('action') and action == 'ºîÀ®'"
           regulator="isRegSetter(REQUEST, new=creating)"
           whichwho="{'nonanon': 'You must be logged-in to',
                      'owners': 'Only the owners may',
diff -ruN ./ZWiki-0.11.0JP003/templates/defaults/subscribeform.dtml ./ZWiki/templates/defaults/subscribeform.dtml
--- ./ZWiki-0.11.0JP003/templates/defaults/subscribeform.dtml	Sun Oct 27 02:02:30 2002
+++ ./ZWiki/templates/defaults/subscribeform.dtml	Sat Oct 26 23:41:57 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 title_or_id>�פؤ� �ۿ���Ͽ(subscription)</TITLE>
 <META NAME="ROBOTS" CONTENT="NOINDEX,NOFOLLOW">
 </HEAD>
 <BODY BGCOLOR="#FFFFFF">
@@ -15,7 +15,7 @@
 <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>
 </dtml-if>
-�᡼����Ͽ(Mail subscription)
+�ۿ���Ͽ(Mail subscription)
 </h1>
 </td>
 </tr>
@@ -30,22 +30,22 @@
 
 <FORM METHOD="POST" ACTION="&dtml-page_url;/subscribeform" ENCTYPE="multipart/form-data">
 
-�����Υڡ����ޤ��Ϥ���Wiki���������Τ��Ф����ɤ���Ͽ������ޤ���
+�����Υڡ����ޤ��Ϥ���Wiki���������Τ��Ф��᡼���ۿ�����Ͽ������ޤ���
  ��Ͽ�Ԥ��Żҥ᡼���ͳ�ǡ������ȤΥ��ԡ���������뤳�Ȥˤʤ�ޤ�
 (���ε�ǽ�ϡ������ȴ����Ԥ������ͭ���ˤ��ʤ��¤����ޤ���)��
-��Ͽ���ʤ��ʤ�С�<a href="&dtml-page_url;">&dtml-id;</a>�����ޤ��礦��<br>
+��Ͽ���ʤ��ʤ�С���<a href="&dtml-page_url;">&dtml-title_or_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).
-Or return to <a href="&dtml-page_url;">&dtml-id;</a>.
+Or return to '<a href="&dtml-page_url;">&dtml-title_or_id;</a>'.
 
 <br><br>
 
 ���ʤ���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 ">
+<INPUT TYPE="submit" NAME="../subscribeform:method" VALUE=" Êѹ¹(Change) ">
 <br><br>
 
 <table width="100%" cellpadding="2" cellspacing="1" border="0">
@@ -75,9 +75,9 @@
 to this page.
 <br>
 <dtml-if "isSubscriber(email)">
-<INPUT TYPE="submit" NAME="../unsubscribe:method" VALUE=" &dtml-id;¤Ø¤ÎÅÐÏ¿¤Î²ò½ü(Unsubscribe from &dtml-id;) " style="font-weight:bold">
+<INPUT TYPE="submit" NAME="../unsubscribe:method" VALUE=" ¡Ö&dtml-title_or_id;¡×¤Ø¤ÎÅÐÏ¿¤Î²ò½ü(Unsubscribe from '&dtml-title_or_id;') " style="font-weight:bold">
 <dtml-else>
-<INPUT TYPE="submit" NAME="../subscribe:method" VALUE=" &dtml-id;¤Ø¤ÎÅÐÏ¿(Subscribe to) &dtml-id; " style="font-weight:bold">
+<INPUT TYPE="submit" NAME="../subscribe:method" VALUE=" ¡Ö&dtml-title_or_id;¡×¤Ø¤ÎÅÐÏ¿(Subscribe to '&dtml-title_or_id;') " style="font-weight:bold">
 </dtml-if>
 <br>
 </td>
@@ -135,7 +135,7 @@
 <tr>
 <td valign="top" width="50%"
 <br>
-<dtml-var id>�ؤ���Ͽ��(subscribers):
+��<dtml-var title_or_id>�פؤ���Ͽ��(subscribers):
 <br>
 <dtml-comment>
 <dtml-let n="subscriberCount()">
@@ -173,7 +173,7 @@
 
 <br>
 <dtml-comment>
-<INPUT TYPE="submit" NAME="..:method" VALUE=" Return to &dtml-id; ">
+<INPUT TYPE="submit" NAME="..:method" VALUE=" Return to &dtml-title_or_id; ">
 </dtml-comment>
 
 </FORM>
diff -ruN ./ZWiki-0.11.0JP003/templates/defaults/wikipage.zpt ./ZWiki/templates/defaults/wikipage.zpt
--- ./ZWiki-0.11.0JP003/templates/defaults/wikipage.zpt	Sun Oct 27 02:02:30 2002
+++ ./ZWiki/templates/defaults/wikipage.zpt	Sun Oct 27 13:51:30 2002
@@ -207,6 +207,7 @@
 <td align="left" valign="middle"
 tal:condition="python:hasattr(container,'UserOptions')">
 <span style="color:gray"><small><em>
+<a href="UserOptions" target="UserOptions">�桼������</a>:
 <a 
 tal:define="current python:request.get('zwiki_displaymode',0)=='full';
             page_url python:here.page_url();
@@ -214,7 +215,7 @@
 tal:attributes="style python:[nothing,'font-weight:bold'][current];
                 href url"
 href="UserOptions?setcookies=1&zwiki_displaymode=full&zwiki_showhierarchy=1&redirectURL=page_url" 
-title="Á´Éô¤òɽ¼¨¤·¤Þ¤¹¡£(show all features)" accesskey="f"><b>����(<u>f</u></b>ull)</a>
+title="������ɽ�����ޤ���(show all features)" accesskey="f">����(<b><u>f</u></b>ull)</a>
 <a 
 tal:define="current python:request.get('zwiki_displaymode','simple')=='simple';
             page_url python:here.page_url();
@@ -262,8 +263,8 @@
 tal:condition="python:here.isMailoutEnabled()"
 tal:attributes="href python:here.page_url() + '/subscribeform'"
 href="page_url/subscribeform" 
-title="¤³¤Î¥Ú¡¼¥¸¤Þ¤¿¤Ï¥µ¥¤¥ÈÁ´ÂΤؤÎEmail¹ØÆɤÎÀßÄê(configure email subscription to this page or site)" accesskey="u"
->������Ͽ(s<b><u>u</u></b>bscribe)</a>
+title="���Υڡ����ޤ��ϥ��������Τؤ�Email�ۿ�������(configure email subscription to this page or site)" accesskey="u"
+>�ۿ���Ͽ(s<b><u>u</u></b>bscribe)</a>
 <span
 tal:condition="python:user.has_permission('Zwiki: Edit pages',here)"
 >
diff -ruN ./ZWiki-0.11.0JP003/templates/zwikidotorgjp/FrontPage.stx ./ZWiki/templates/zwikidotorgjp/FrontPage.stx
--- ./ZWiki-0.11.0JP003/templates/zwikidotorgjp/FrontPage.stx	Sun Oct 27 02:02:29 2002
+++ ./ZWiki/templates/zwikidotorgjp/FrontPage.stx	Sun Oct 27 02:35:29 2002
@@ -45,9 +45,9 @@
 'Zwiki: ' and appear at the end of the permissions list.
 -->
 
-- **�᡼�� ���� (������Ͽ)** <br>
+- **�᡼�� ���� (�ۿ���Ͽ)** <br>
 ��Zope��HailHost���֥������Ȥ�����ȡ�mail_from�ץե������ͭ�����������ɥ쥹��
-ʸ���ץ��ѥƥ����ɲä��ޤ����ֹ�����Ͽ�פΥ�󥯤ϥڡ����եå�����ɽ������ޤ���
+ʸ���ץ��ѥƥ����ɲä��ޤ������ۿ���Ͽ�פΥ�󥯤ϥڡ����եå���ɽ������ޤ���
 BCC����ˤϡ���ZWiki:MailHostFix�פ��ɲä��ޤ���
 
 <!--
diff -ruN ./ZWiki-0.11.0JP003/templates/zwikidotorgjp/HelpPage.stx ./ZWiki/templates/zwikidotorgjp/HelpPage.stx
--- ./ZWiki-0.11.0JP003/templates/zwikidotorgjp/HelpPage.stx	Sun Oct 27 02:02:29 2002
+++ ./ZWiki/templates/zwikidotorgjp/HelpPage.stx	Sun Oct 27 00:43:56 2002
@@ -63,13 +63,13 @@
     ¸å¤ËÆþ¤ì²þ¹Ô¡£ ¥­¥ã¥Ô¥¿¥é¥¤¥º¤ä¶õÇòʸ»ú¤Ï̵»ë½ÐÍè¤Þ¤¹¡£(¤¨¤Ã!! ËÜÅö?? Ìõ¤Î´Ö°ã¤¤¤«??)
 
 
-<a name="email_j"> ¥á¡¼¥ë¥µ¡¼¥Ó¥¹ÅÐÏ¿
+<a name="email_j"> ¥á¡¼¥ëÇÛ¿®ÅÐÏ¿
 
-¡¡²¼Êý¤Î¡ÖÅÐÏ¿(subscribe)¡×¥ê¥ó¥¯¤¬¸«¤¨¤ë¤Ê¤é¡¢¥á¡¼¥ë¤Ç¥³¥á¥ó¥È¤ò¼õ¤±¤ë°Ù¤Î
+¡¡²¼Êý¤Î¡ÖÇÛ¿®ÅÐÏ¿(subscribe)¡×¥ê¥ó¥¯¤¬¸«¤¨¤ë¤Ê¤é¡¢¥á¡¼¥ë¤Ç¥³¥á¥ó¥È¤ò¼õ¤±¤ë°Ù¤Î
 ÅÐÏ¿¤ò¤½¤Î¥Ú¡¼¥¸¤Þ¤¿¤ÏWiki¥µ¥¤¥ÈÁ´ÂΤˤ¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤¹¡£ ¤Þ¤¿¡¢ÀßÄ꤬
 ¤Ê¤µ¤ì¤Æ¤¤¤ì¤Ð¡¢ÅÐÏ¿¼Ô¤ÏƱÍͤ˥᡼¥ë¤ÇÁ÷¿®¤â¤¢¤ê¤Ç¤¹¡£
 
-  - ¥á¡¼¥ë¤Ë¤è¤ë¥³¥á¥ó¥È(ÊÔ½¸¤Ê¤·)¼õ¿®¡¢¡ÖÅÐÏ¿(subscribe)¡×¤Î¥¯¥ê¥Ã¥¯;
+  - ¥á¡¼¥ë¤Ë¤è¤ë¥³¥á¥ó¥È(ÊÔ½¸¤Ê¤·)¼õ¿®¡¢¡ÖÇÛ¿®ÅÐÏ¿(subscribe)¡×¤Î¥¯¥ê¥Ã¥¯;
   ¤â¤·É¬Íפʤ顢¤´¼«Ê¬¤ÎEmail¥¢¥É¥ì¥¹¤òÆþ¤ì¡¢¡ÖÊѹ¹(Change)¡×¤ò¥¯¥ê¥Ã¥¯;
   ¤¢¤Ê¤¿¤ÎÅÐÏ¿¾õÂÖ¤òÀÚÂؤë¤Ë¤Ï¤½¤Î¥Ú¡¼¥¸¤Þ¤¿¤ÏWikiÁ´ÂΤΥܥ¿¥ó¤ò¥¯¥ê¥Ã¥¯
   (Îп§¤Ï¤¢¤Ê¤¿¤«ÅÐÏ¿¤·¤Æ¤¤¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹)¡£
diff -ruN ./ZWiki-0.11.0JP003/templates/zwikidotorgjp/UserOptions.stxdtml ./ZWiki/templates/zwikidotorgjp/UserOptions.stxdtml
--- ./ZWiki-0.11.0JP003/templates/zwikidotorgjp/UserOptions.stxdtml	Sun Oct 27 02:02:29 2002
+++ ./ZWiki/templates/zwikidotorgjp/UserOptions.stxdtml	Sun Oct 27 02:51:01 2002
@@ -117,7 +117,7 @@
 'GMT+1100',
 'GMT+1130',
 )"
-userzone="((REQUEST.get('zwiki_timezone',None) in timezones) and zwiki_timezone) or 'GMT'"
+userzone="((REQUEST.get('zwiki_timezone',None) in timezones) and zwiki_timezone) or 'Japan'"
 >
 ¥í¡¼¥«¥ë¥¿¥¤¥à¤Ï(Your local time is) 
 <select name="zwiki_timezone" tabindex=5>
@@ -134,7 +134,7 @@
 ¥Ö¥Ã¥¯¥Þ¡¼¥¯(Bookmarks): 
 <input type="text" name="zwiki_bookmarks" size=60 maxlength=3000 tabindex=6
 value="<dtml-var zwiki_bookmarks html_quote 
-missing="¥æ¡¼¥¶ÀßÄê:UserOptions RecentChanges">">
+missing="UserOptions RecentChanges">">
 <br>
 (¥Õ¥Ã¥¿¤Ë¤¢¤ê¤Þ¤¹(appear in footer); konqueror users, separate your bookmarks with , not space)
 
@@ -181,9 +181,9 @@
 </dtml-comment>
 
 <div align="right"> 
-<b><input type="submit" name="setcookies" value="Set options" tabindex=12
+<b><input type="submit" name="setcookies" value="¥ª¥×¥·¥ç¥óÀßÄê(Set options)" tabindex=12
 style="font-weight:bold"></b>
-<input type="submit" name="clearcookies" value="Forget options"
+<input type="submit" name="clearcookies" value="¥ª¥×¥·¥ç¥ó¾Ãµî(Forget options)"
 tabindex=13> 
 </div>
 <input type="hidden" name="zwiki_displaymode"