[Phpgroupware-cvs] wiki/setup phpgw_ja.lang, 1.2 default_records.inc.php, 1.6 setup.inc.php, 1.2

[skwashd]

Update of wiki/setup

Added Files:
     Branch: MAIN
            phpgw_ja.lang lines: +5 -0
Modified Files:
     Branch: MAIN
            default_records.inc.php lines: +3 -13
            setup.inc.php lines: +4 -4

Log Message:
merge from 16

====================================================
Index: phpgw_ja.lang
please contact the <a href="mailto:%1";>administrator</a> for assistence.        
wiki    ja      ÌäÂê¤ò²ò·è¤¹¤ë°Ù¤Ë¡¢<a 
href="mailto:%1";>´ÉÍý¼Ô</a>¤ËÏ¢Íí¤·¤Æ¤¯¤À¤µ¤¤¡£
wiki    common  ja      Wiki
wiki is a modified version of <a href="http://tavi.sf.net"; 
target="_new">wikkitikkitavi</a> for use with phpgroupware.  common  ja      
Wiki¥¯¥í¡¼¥ó¤Ç¤¢¤ë<a href="http://tavi.sf.net"; 
target="_new">WikkiTikkiTavi</a>¤ÎphpGroupWare°Ü¿¢ÈǤǤ¹¡£
you have been denied access to this site.       wiki    ja      
¤³¤Î¥µ¥¤¥È¤Ø¤Î¥¢¥¯¥»¥¹¸¢¸Â¤¬¤¢¤ê¤Þ¤»¤ó
you have exeeded the number of pages you are allowed to visit in a given period 
of time.  please return later.  wiki    ja      
»ØÄꤵ¤ì¤¿´ü´Ö¤Ë¤ª¤±¤ë¥Ú¡¼¥¸Ë¬ÌäµöÍƲó¿ô¤òĶ¤¨¤Æ¤·¤Þ¤¤¤Þ¤·¤¿¡£¤·¤Ð¤é¤¯¤·¤Æ¤«¤é¥¢¥¯¥»¥¹¤·¤Æ¤¯¤À¤µ¤¤¡£

====================================================
Index: wiki/setup/default_records.inc.php
diff -u wiki/setup/default_records.inc.php:1.5 
wiki/setup/default_records.inc.php:1.6
--- wiki/setup/default_records.inc.php:1.5      Fri Mar 21 23:43:56 2003
+++ wiki/setup/default_records.inc.php  Sun May 15 12:55:31 2005
@@ -14,15 +14,5 @@

        $time = time();
        $oProc->query("INSERT INTO phpgw_wiki_pages 
(title,version,time,supercede,username,author,body,comment) VALUES 
('RecentChanges',1,$time,$time,'setup','localhost','[[! *]]\n','')");
-       $oProc->query("INSERT INTO phpgw_wiki_pages 
(title,version,time,supercede,username,author,body,comment) VALUES 
('phpGroupWare',1,$time,$time,'setup','localhost','Welcome to 
\\'\\'\\'Wiki\\'\\'\\' - the phpGroupWare Version of 
\\'\\'\\'WikkiTikkiTavi\\'\\'\\'. Wikis are a revolutionary new form of 
collaboration and online community.
-
-\\'\\'\\'phpGroupWare\\'\\'\\' is the groupware suite you are useing right 
now. For further information see http://www.phpgroupware.org','')");
-
-       $oProc->query("INSERT INTO phpgw_wiki_pages 
(title,version,time,supercede,username,author,body,comment) VALUES 
('WikkiTikkiTavi',1,$time,$time,'setup','localhost','= WikkiTikkiTavi =
-
-WikkiTikkiTavi is the original version this documentation system.
-Their documentation is usable for the ((phpGroupWare)) \\'\\'\\'Wiki\\'\\'\\' 
too.
-
-The documentation of WikkiTikkiTavi is online availible at: 
http://tavi.sourceforge.net
-You can learn about Wiki formatting at 
http://tavi.sourceforge.net/FormattingRules\n','')");
-
+       $oProc->query("INSERT INTO phpgw_wiki_pages 
(title,version,time,supercede,username,author,body,comment) VALUES 
('phpGroupWare',1,$time,$time,'setup','localhost','Welcome to " . 
$oProc->m_odb->db_addslashes("'''Wiki'''") . " - the phpGroupWare Version of " 
. $oProc->m_odb->db_addslashes("'''WikkiTikkiTavi'''") . ". Wikis are a 
revolutionary new form of collaboration and online community.\n\n" . 
$oProc->m_odb->db_addslashes("'''phpGroupWare'''") . " is the groupware suite 
you are useing right now. For further information see 
http://www.phpgroupware.org','')");
+       $oProc->query("INSERT INTO phpgw_wiki_pages 
(title,version,time,supercede,username,author,body,comment) VALUES 
('WikkiTikkiTavi',1,$time,$time,'setup','localhost','= WikkiTikkiTavi 
=\n\nWikkiTikkiTavi is the original version this documentation system.\nTheir 
documentation is usable for the ((phpGroupWare)) " . 
$oProc->m_odb->db_addslashes("'''Wiki'''") . " too.\n\nThe documentation of 
WikkiTikkiTavi is online availible at: http://tavi.sourceforge.net\nYou can 
learn about Wiki formatting at 
http://tavi.sourceforge.net/FormattingRules\n','')");

====================================================
Index: wiki/setup/setup.inc.php
diff -u wiki/setup/setup.inc.php:1.1 wiki/setup/setup.inc.php:1.2
--- wiki/setup/setup.inc.php:1.1        Mon Mar  3 14:16:24 2003
+++ wiki/setup/setup.inc.php    Sun May 15 12:55:31 2005
@@ -20,8 +20,8 @@
        $setup_info['wiki']['license']   = 'GPL';
        $setup_info['wiki']['description'] =
                'Wiki is a modified version of <a href="http://tavi.sf.net"; 
target="_new">WikkiTikkiTavi</a> for use with phpGroupware.';
-       $setup_info['wiki']['maintainer'] = 'Ralf Becker';
-       $setup_info['wiki']['maintainer_email'] = 'address@hidden';
+       $setup_info['wiki']['maintainer'] = 'phpGroupWare Coordination Team';
+       $setup_info['wiki']['maintainer_email'] = 'address@hidden';

        $setup_info['wiki']['tables'][] = 'phpgw_wiki_links';
        $setup_info['wiki']['tables'][] = 'phpgw_wiki_pages';
@@ -37,6 +37,6 @@
        $setup_info['wiki']['depends'][] = array
        (
                'appname'  => 'phpgwapi',
-               'versions' => Array('0.9.13', '0.9.14', '0.9.15')
+               'versions' => Array('0.9.13', '0.9.14', '0.9.15', '0.9.16')
        );
 ?>