[Phpgroupware-cvs] hr/setup setup.inc.php, 1.8 phpgw_fr.lang, 1.4 phpgw_de.lang, 1.4 phpgw_en.lang, 1.4

[skwashd]

Update of hr/setup

Modified Files:
     Branch: MAIN
            setup.inc.php lines: +5 -4
            phpgw_fr.lang lines: +10 -1
            phpgw_de.lang lines: +1 -1
            phpgw_en.lang lines: +10 -1

Log Message:
merge in changes from 16

====================================================
Index: hr/setup/setup.inc.php
diff -u hr/setup/setup.inc.php:1.7 hr/setup/setup.inc.php:1.8
--- hr/setup/setup.inc.php:1.7  Sun May 15 14:36:08 2005
+++ hr/setup/setup.inc.php      Mon Aug 29 04:14:29 2005
@@ -13,6 +13,7 @@

        /* Basic information about this app */
        $setup_info['hr']['name']      = 'hr';
+       $setup_info['hr']['title']     = 'Company Directory';
        $setup_info['hr']['version']   = '0.8.1';
        $setup_info['hr']['app_order'] = 20;
        $setup_info['hr']['enable']    = 1;
@@ -21,12 +22,12 @@
        $setup_info['hr']['license']  = 'GPL';
        $setup_info['hr']['description'] =
                'Human resource - Company Directory.';
-       $setup_info['hr']['maintainer'] = 'Mark Peters<br />Joseph Engo';
-       $setup_info['hr']['maintainer_email'] = 'address@hidden<br 
/>address@hidden';
+       $setup_info['hr']['maintainer'] = 'Mark Peters<br>Joseph Engo';
+       $setup_info['hr']['maintainer_email'] = 
'address@hidden<br>address@hidden';

        /* Dependencies for this app to work */
        $setup_info['hr']['depends'][] = array(
                'appname'  => 'phpgwapi',
-               'versions' => Array('0.9.16', '0.9.17', '0.9.18')
+               'versions' => 
Array('0.9.10','0.9.11','0.9.12','0.9.13','0.9.14', '0.9.16')
        );
 ?>

====================================================
Index: hr/setup/phpgw_fr.lang
diff -u hr/setup/phpgw_fr.lang:1.3 hr/setup/phpgw_fr.lang:1.4
--- hr/setup/phpgw_fr.lang:1.3  Thu Jan  9 22:51:50 2003
+++ hr/setup/phpgw_fr.lang      Mon Aug 29 04:14:29 2005
@@ -1,2 +1,11 @@
+account login  hr      fr      Login de compte
 company directory      common  fr      Répertoire de la société
-hr     common  fr      Ressources Humaines
+group login    hr      fr      Login de groupe
+home email     hr      fr      EMail domicile
+home phone     hr      fr      Téléphone domicile
+human resources        common  fr      Ressources humaines
+member of the following groups hr      fr      Membre des groupes suivants
+members of the group   hr      fr      Membres du groupe
+profile        hr      fr      Profil
+work email     hr      fr      EMail travail
+work phone     hr      fr      Téléphone travail

====================================================
Index: hr/setup/phpgw_de.lang
diff -u hr/setup/phpgw_de.lang:1.3 hr/setup/phpgw_de.lang:1.4
--- hr/setup/phpgw_de.lang:1.3  Fri Nov 15 22:31:50 2002
+++ hr/setup/phpgw_de.lang      Mon Aug 29 04:14:29 2005
@@ -1 +1 @@
-hr     common  de      Mitarbeiter Verzeichnis
+human resources        common  de      Personenverzeichnis

====================================================
Index: hr/setup/phpgw_en.lang
diff -u hr/setup/phpgw_en.lang:1.3 hr/setup/phpgw_en.lang:1.4
--- hr/setup/phpgw_en.lang:1.3  Fri Nov 15 22:31:50 2002
+++ hr/setup/phpgw_en.lang      Mon Aug 29 04:14:29 2005
@@ -1,2 +1,11 @@
+account login  hr      en      account login
 company directory      common  en      Company Directory
-hr     common  en      Human Resources
+group login    hr      en      group login
+home email     hr      en      home email
+home phone     hr      en      home phone
+human resources        common  en      Human Resources
+member of the following groups hr      en      member of the following groups
+members of the group   hr      en      members of the group
+profile        hr      en      profile
+work email     hr      en      work email
+work phone     hr      en      work phone