[Phpgroupware-cvs] sitemgr/setup tables_current.inc.php, 1.17 tables_baseline.inc.php, 1.4 setup.inc.php, 1.20 phpgw_fr.lang, 1.10 tables_update.inc.php, 1.20 phpgw_en.lang, 1.14

[skwashd]

Update of sitemgr/setup

Modified Files:
     Branch: MAIN
            tables_current.inc.php lines: +12 -12
            tables_baseline.inc.php lines: +12 -0
            setup.inc.php lines: +11 -17
            phpgw_fr.lang lines: +6 -0
            tables_update.inc.php lines: +10 -21
            phpgw_en.lang lines: +6 -0

Log Message:
merge from 16

====================================================
Index: sitemgr/setup/tables_current.inc.php
diff -u sitemgr/setup/tables_current.inc.php:1.16 
sitemgr/setup/tables_current.inc.php:1.17
--- sitemgr/setup/tables_current.inc.php:1.16   Thu May 12 06:28:12 2005
+++ sitemgr/setup/tables_current.inc.php        Sun May 15 02:16:27 2005
@@ -1,15 +1,15 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare                                                          
   *
-       * http://www.phpgroupware.org                                           
   *
-       * --------------------------------------------                          
   *
-       *  This program is free software; you can redistribute it and/or modify 
it *
-       *  under the terms of the GNU General Public License as published by 
the   *
-       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
-       *  option) any later version.                                           
   *
-       
\**************************************************************************/
-
-       /* $Id$ */
+       
/**************************************************************************\
+       * phpGroupWare                                                          
   *
+       * http://www.phpgroupware.org                                           
   *
+       * --------------------------------------------                          
   *
+       *  This program is free software; you can redistribute it and/or modify 
it *
+       *  under the terms of the GNU General Public License as published by 
the   *
+       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
+       *  option) any later version.                                           
   *
+       
\**************************************************************************/
+
+       /* $Id$ */

        $phpgw_baseline = array(
                'phpgw_sitemgr_pages' => array(
@@ -168,4 +168,4 @@
                        'ix' => array(),
                        'uc' => array()
                ),
-       );
+       );
\ No newline at end of file

====================================================
Index: sitemgr/setup/tables_baseline.inc.php
diff -u sitemgr/setup/tables_baseline.inc.php:1.3 
sitemgr/setup/tables_baseline.inc.php:1.4
--- sitemgr/setup/tables_baseline.inc.php:1.3   Thu May 12 06:28:12 2005
+++ sitemgr/setup/tables_baseline.inc.php       Sun May 15 02:16:27 2005
@@ -1,4 +1,16 @@
 <?php
+       
/**************************************************************************\
+       * phpGroupWare                                                          
   *
+       * http://www.phpgroupware.org                                           
   *
+       * --------------------------------------------                          
   *
+       *  This program is free software; you can redistribute it and/or modify 
it *
+       *  under the terms of the GNU General Public License as published by 
the   *
+       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
+       *  option) any later version.                                           
   *
+       
\**************************************************************************/
+
+       /* $Id$ */
+
        $phpgw_baseline = array(
                'phpgw_sitemgr_pages' => array(
                        'fd' => array(

====================================================
Index: sitemgr/setup/setup.inc.php
diff -u sitemgr/setup/setup.inc.php:1.19 sitemgr/setup/setup.inc.php:1.20
--- sitemgr/setup/setup.inc.php:1.19    Thu May 12 06:28:12 2005
+++ sitemgr/setup/setup.inc.php Sun May 15 02:16:27 2005
@@ -1,15 +1,15 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare - sitemgr                                                
   *
-       * http://www.phpgroupware.org                                           
   *
-       * --------------------------------------------                          
   *
-       *  This program is free software; you can redistribute it and/or modify 
it *
-       *  under the terms of the GNU General Public License as published by 
the   *
-       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
-       *  option) any later version.                                           
   *
-       
\**************************************************************************/
-
-       /* $Id$ */
+       
/**************************************************************************\
+       * phpGroupWare - Notes                                                  
   *
+       * http://www.phpgroupware.org                                           
   *
+       * --------------------------------------------                          
   *
+       *  This program is free software; you can redistribute it and/or modify 
it *
+       *  under the terms of the GNU General Public License as published by 
the   *
+       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
+       *  option) any later version.                                           
   *
+       
\**************************************************************************/
+
+       /* $Id$ */

        $setup_info['sitemgr']['name']      = 'sitemgr';
        $setup_info['sitemgr']['title']     = 'SiteMgr Web Content Manager';
@@ -23,12 +23,6 @@
        );
        $setup_info['sitemgr']['enable']    = 1;

-       $setup_info['sitemgr']['maintainer'] = array(
-               'name'  => 'Dave Hall',
-               'email' => 'skwashd at phpgroupware.org'
-       );
-
-
        /* The hooks this app includes, needed for hooks registration */
        $setup_info['sitemgr']['hooks'][] = 'preferences';
        $setup_info['sitemgr']['hooks'][] = 'about';

====================================================
Index: sitemgr/setup/phpgw_fr.lang
diff -u sitemgr/setup/phpgw_fr.lang:1.9 sitemgr/setup/phpgw_fr.lang:1.10
--- sitemgr/setup/phpgw_fr.lang:1.9     Tue Jul 20 23:22:54 2004
+++ sitemgr/setup/phpgw_fr.lang Sun May 15 02:16:27 2005
@@ -71,6 +71,7 @@
 deleting all data for %1       sitemgr fr      Effacement de toutes les 
données pour %1
 discussions    sitemgr fr      Discussions
 display link to autoregistration below login form?     sitemgr fr      
Afficher le lien vers l'auto-enregistrement sous le formulaire de login?
+display list   sitemgr fr      Afficher la liste
 do you want to delete them?    sitemgr fr      Voulez-vous les effacer?
 do you want to publish a rss feed for this news category       sitemgr fr      
Voulez-vous publier un flux RSS pour cette catégorie de nouvelles
 don't have an account? sitemgr-site    fr      Vous n'avez pas de compte?
@@ -101,12 +102,14 @@
 forum  sitemgr fr      Forum
 full path of the xslt file that should be applied to the xml files     sitemgr 
fr      Chemin complet des fichiers XSLT qui doivent être appliqués aux 
fichiers XML
 galerie        sitemgr fr      Galerie
+go     sitemgr fr      Allez
 go back to page manager        sitemgr fr      Retourner au gestionnaire de 
pages
 go back to the category manager.       sitemgr fr      Retourner au 
gestionnaire de catégories.
 go to  sitemgr fr      Aller à
 go to page manager     sitemgr fr      Aller au gestionnaire de pages
 google sitemgr fr      Google
 google search  sitemgr-site    fr      Recherche Google
+goto   sitemgr fr      Aller
 group access permissions       sitemgr fr      Permissions d'accès de groupe
 group name     sitemgr fr      Nom du groupe
 header editor  sitemgr fr      Editeur d'entête
@@ -210,8 +213,10 @@
 seen by        sitemgr fr      Vu par
 select a category      sitemgr fr      Choisissez une catégorie
 select a forum sitemgr fr      Choisissez un forum
+select all     sitemgr fr      Choisir tous
 select allowed modules sitemgr fr      Choisissez les modules autorisés
 select persons and groups that are entitled to configure the website.  sitemgr 
fr      Choisir les personnes et groupes attitrés pour configurer le site Web.
+select site to view    sitemgr fr      Choisir le site à visualiser
 selected template %1 does not exist.   sitemgr-site    fr      Le gabarit %1 
sélectionné n'existe pas.
 selected theme %1 does not exist.      sitemgr-site    fr      Le thème %1 
sélectionné n'existe pas.
 should the file be viewed in the browser or downloaded sitemgr fr      Le 
fichier doit-il être vu dans le navigateur ou downloadé
@@ -341,4 +346,5 @@
 you must be an administrator to setup the site manager.        sitemgr fr      
Seul l'administrateur peut configurer le gestionnaire de site.
 you removed one ore more languages from your site languages.   sitemgr fr      
Vous avez supprimé une ou plusieurs des langues de votre site.
 your administrator has not yet setup the web content manager for public 
viewing.  go bug your administrator to get their butt in gear. sitemgr fr      
Votre administrateur n'a pas encore configuré le gestionnaire de contenu Web 
pour l'accès public.  Allez pousser votre administrateur pour qu'il bouge ses 
fesses rapidement.
+your administrator has not yet setup the web content manager for public 
viewing.  please contact your administrator to get this fixed. sitemgr fr      
Votre administrateur n'a pas encore configuré le gestionnaire de contenu web 
pour l'affichage.  SVP contactez votre administrateur pour qu'il corrige cela.
 your calendar  sitemgr-site    fr      Votre calendrier

====================================================
Index: sitemgr/setup/tables_update.inc.php
diff -u sitemgr/setup/tables_update.inc.php:1.19 
sitemgr/setup/tables_update.inc.php:1.20
--- sitemgr/setup/tables_update.inc.php:1.19    Thu May 12 06:28:12 2005
+++ sitemgr/setup/tables_update.inc.php Sun May 15 02:16:27 2005
@@ -1,28 +1,17 @@
 <?php
-       /**
-       * Sitemanager - Setup
-       *
-       * @copyright Copyright (C) 2002-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package sitemanager
-       * @subpackage setup
-       * @version $Id$
-       */
+       
/**************************************************************************\
+       * phpGroupWare                                                          
   *
+       * http://www.phpgroupware.org                                           
   *
+       * --------------------------------------------                          
   *
+       *  This program is free software; you can redistribute it and/or modify 
it *
+       *  under the terms of the GNU General Public License as published by 
the   *
+       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
+       *  option) any later version.                                           
   *
+       
\**************************************************************************/

+       /* $Id$ */

        $test[] = '0.9.13.001';
-
-
-       /**
-       * Update to 0.9.13.001
-       *
-       * @return string New version
-       */
-       /**
-       * Update to 0.9.13.001
-       *
-       * @return string New version
-       */
        function sitemgr_upgrade0_9_13_001()
        {
                global $setup_info,$phpgw_setup;

====================================================
Index: sitemgr/setup/phpgw_en.lang
diff -u sitemgr/setup/phpgw_en.lang:1.13 sitemgr/setup/phpgw_en.lang:1.14
--- sitemgr/setup/phpgw_en.lang:1.13    Tue Jul 20 23:22:54 2004
+++ sitemgr/setup/phpgw_en.lang Sun May 15 02:16:27 2005
@@ -71,6 +71,7 @@
 deleting all data for %1       sitemgr en      Deleting all data for %1
 discussions    sitemgr en      Discussions
 display link to autoregistration below login form?     sitemgr en      Display 
link to autoregistration below login form?
+display list   sitemgr en      display list
 do you want to delete them?    sitemgr en      Do you want to delete them?
 do you want to publish a rss feed for this news category       sitemgr en      
Do you want to publish a RSS feed for this news category
 don't have an account? sitemgr-site    en      Don't have an account?
@@ -101,12 +102,14 @@
 forum  sitemgr en      Forum
 full path of the xslt file that should be applied to the xml files     sitemgr 
en      Full path of the XSLT file that should be applied to the XML files
 galerie        sitemgr en      Galerie
+go     sitemgr en      go
 go back to page manager        sitemgr en      Go back to Page Manager
 go back to the category manager.       sitemgr en      Go back to the category 
manager.
 go to  sitemgr en      Go to
 go to page manager     sitemgr en      Go to Page Manager
 google sitemgr en      Google
 google search  sitemgr-site    en      Google Search
+goto   sitemgr en      goto
 group access permissions       sitemgr en      Group Access Permissions
 group name     sitemgr en      Group Name
 header editor  sitemgr en      Header Editor
@@ -210,8 +213,10 @@
 seen by        sitemgr en      Seen by
 select a category      sitemgr en      Select a category
 select a forum sitemgr en      Select a forum
+select all     sitemgr en      select all
 select allowed modules sitemgr en      Select allowed modules
 select persons and groups that are entitled to configure the website.  sitemgr 
en      Select persons and groups that are entitled to configure the website.
+select site to view    sitemgr en      select site to view
 selected template %1 does not exist.   sitemgr-site    en      Selected 
template %1 does not exist.
 selected theme %1 does not exist.      sitemgr-site    en      Selected theme 
%1 does not exist.
 should the file be viewed in the browser or downloaded sitemgr en      Should 
the file be viewed in the browser or downloaded
@@ -341,4 +346,5 @@
 you must be an administrator to setup the site manager.        sitemgr en      
You must be an administrator to setup the Site Manager.
 you removed one ore more languages from your site languages.   sitemgr en      
You removed one ore more languages from your site languages.
 your administrator has not yet setup the web content manager for public 
viewing.  go bug your administrator to get their butt in gear. sitemgr en      
Your administrator has not yet setup the web content manager for public 
viewing.  Go bug your administrator to get their butt in gear.
+your administrator has not yet setup the web content manager for public 
viewing.  please contact your administrator to get this fixed. sitemgr en      
Your administrator has not yet setup the web content manager for public 
viewing.  Please contact your administrator to get this fixed.
 your calendar  sitemgr-site    en      Your Calendar