diff -ruN ./ZWiki-0.11.0JP002/CHANGES.txt ./ZWiki/CHANGES.txt
--- ./ZWiki-0.11.0JP002/CHANGES.txt	Sun Oct 20 01:45:03 2002
+++ ./ZWiki/CHANGES.txt	Sat Oct 19 15:11:10 2002
@@ -1,4 +1,11 @@
 Zwiki 0.11.0 2002-10-01
+   
+   ����
+
+       �Х��Ȥꡢ��ݲ��ڡ���̾�������Ρ��ȵ��ܡ�WikiForNows�Ȥδ���Ʊ��
+       CMFWiki�Ȥ�����(alpha)��
+
+Zwiki 0.11.0 2002-10-01
 
     Summary
 
diff -ruN ./ZWiki-0.11.0JP002/Mail.py ./ZWiki/Mail.py
--- ./ZWiki-0.11.0JP002/Mail.py	Sun Oct 20 01:45:03 2002
+++ ./ZWiki/Mail.py	Sun Oct 20 01:24:35 2002
@@ -493,7 +493,7 @@
            pageurl,
            self.wiki_url(),
            mailouttext,
-           getattr(self.folder(),'mail_signature','forwarded from %s') %pageurl
+           getattr(self.folder(),'mail_signature','�ۿ���������: %s %s \nforwarded from %s') %(self.folder().title,pageurl,pageurl)
            ) # mail_signature is very temporary.. I think
         mhost.send(msg)
 
diff -ruN ./ZWiki-0.11.0JP002/ReadMeJP.txt ./ZWiki/ReadMeJP.txt
--- ./ZWiki-0.11.0JP002/ReadMeJP.txt	Thu Jan  1 09:00:00 1970
+++ ./ZWiki/ReadMeJP.txt	Sun Oct 20 01:41:39 2002
@@ -0,0 +1,17 @@
+������Zope�ץ������Ȥϡ����ʤ���Zope���������Wiki�����֤��뤳�Ȥ��ǽ�ˤ��ޤ���
+
+�ں�������
+ 
+  1. ZWiki-x.x.x.tgz �򤢤ʤ���Zope�����Ф�Products �ǥ��쥯�ȥ�˲��ष�ޤ���
+
+  2. Zope��Ƶ�ư���ޤ���
+
+  3. Zope�δ������̤ǡ�ZWiki�����֤��ɲò�������
+
+��������ZWiki���ܸ�ѥå������θ���ϡ�README.txt�ˤ����̤ꡢSimon Michael 
+  <simon@joyful.com>���濴�Ȥ���ZWiki���ߥ�˥ƥ�������ʪ�Ǥ��ꡢ
+  GNU GPL�Ȥ������ۤ���Ƥ��ޤ���
+  ���ޤ������Υѥå������ϡ����ܤ�Zope�桼����ͭ�֤ι׸��ˤ��������줿
+   ��Ȥ��˺������Ƥ��ޤ���������Х����󡢤���ˤ��ո��ʤɤ������ޤ�����
+   ����Zope�桼����Υۡ���ڡ�����(http://wiki.zope.jp/ZWikiJapanesePack/)��
+   ���ꤤ�����夲�ޤ���
diff -ruN ./ZWiki-0.11.0JP002/ZWikiPage.py ./ZWiki/ZWikiPage.py
--- ./ZWiki-0.11.0JP002/ZWikiPage.py	Sun Oct 20 01:45:03 2002
+++ ./ZWiki/ZWikiPage.py	Sun Oct 20 00:22:13 2002
@@ -912,7 +912,7 @@
         #    page = self.folder()[unquote(pagename)]
         # I think they all need unquoting
         # also allow for differing wikiname & id now
-        page = self.pageWithName(unquote(pagename))
+        page = self.pageWithName(unquote_i(pagename))
         # bah!!!
         if page:
             linktitle = page.linkTitle()
@@ -2661,10 +2661,25 @@
         titlestr=_('Edit conflict')
         return MessageDialog(
             title=titlestr,
-            message="""
-            <b>%s</b>
+            message="""<table><tr><td>
+                        <center><b>�Խ��Ǿ��ͤ�ȯ�����ޤ���</b></center>
+            <p>
+            ���ʤ����Խ���ˡ��ɤʤ���¾���������Υڡ�������ؤ��ޤ�����<br>
+            ���ξ��ͤ��褹��ˤϡ����Τ��Ȥ�¹Ԥ��Ʋ�������:
+            <ol>
+            <li>�֥饦���ΥХå��ܥ���򥯥�å����ޤ���
+            <li>���ʤ����Խ�������ʬ�򥯥�åץܡ��Ȥ˥��ԡ����ޤ���
+            <li>��ե�å���ܥ���򥯥�å����ޤ���
+            <li>¾����ʬ�ؤαƶ��˵����դ��ơ��Խ��ս��ĥ�դ����������ޤ���
+            <li>���١��ѹ��ܥ���򥯥�å����ޤ���
+            </ol>
+            �ޤ���
+            <p>
+            �����Խ���ΤƤơ�����ƿ������Խ����ޤ����ϣˤ򥯥�å����ޤ���
+
+            <center><b>%s</b></center>
             <p>
-            %s.
+            %s.<br>
             %s:
             <ol>
             <li>%s
@@ -2675,7 +2690,7 @@
             </ol>
             %s,
             <p>
-            %s.
+            %s.</td></tr></table>
             """ % (
             titlestr,
             _("Someone else has saved this page while you were editing"),
@@ -3430,3 +3445,26 @@
 #large programs, it is wise to use some kind of convention that
 #...
 #verbs for methods and nouns for data attributes."
+
+
+def unquote_i(s):
+    """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]+)')
+    if re.match(pat,s[0:2]): s=s[1:]
+    list = s.split('_')
+    res = [list[0]]
+    myappend = res.append
+    del list[0]
+    for item in list:
+        if item[1:2]:
+            try:
+                myappend(mychr(myatoi(item[:2], 16))
+                     + item[2:])
+            except:
+                myappend('%' + item)
+        else:
+            myappend('%' + item)
+    return "".join(res)