浏览代码

Updated dictionaries (in particular for new authentication modules)

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@632 a333f486-631f-4898-b8df-5754b55c2be0
romainq 15 年之前
父节点
当前提交
87920ab580

+ 2 - 0
addons/userrights/userrightsmatrix.class.inc.php

@@ -234,6 +234,7 @@ class UserRightsMatrix extends UserRightsAddOnAPI
 				}
 			}
 		}
+		/*
 		// Create the "My Bookmarks" menu item (parent_id = 0, rank = 6)
 		if ($bNewUser)
 		{
@@ -257,6 +258,7 @@ class UserRightsMatrix extends UserRightsAddOnAPI
 			$oMenu->Set('user_id', $iUserId);
 			$oMenu->DBInsert();
 		}
+		*/
 	}
 
 

+ 4 - 66
dictionaries/dictionary.itop.ui.php

@@ -29,41 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: menuNode
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:menuNode' => 'menuNode',
-	'Class:menuNode+' => 'Main menu configuration elements',
-	'Class:menuNode/Attribute:name' => 'Menu Name',
-	'Class:menuNode/Attribute:name+' => 'Short name for this menu',
-	'Class:menuNode/Attribute:label' => 'Menu Description',
-	'Class:menuNode/Attribute:label+' => 'Long description for this menu',
-	'Class:menuNode/Attribute:hyperlink' => 'Hyperlink',
-	'Class:menuNode/Attribute:hyperlink+' => 'Hyperlink to the page',
-	'Class:menuNode/Attribute:icon_path' => 'Menu Icon',
-	'Class:menuNode/Attribute:icon_path+' => 'Path to the icon of the menu',
-	'Class:menuNode/Attribute:template' => 'Template',
-	'Class:menuNode/Attribute:template+' => 'HTML template for the view',
-	'Class:menuNode/Attribute:type' => 'Type',
-	'Class:menuNode/Attribute:type+' => 'Type of menu',
-	'Class:menuNode/Attribute:type/Value:application' => 'application',
-	'Class:menuNode/Attribute:type/Value:application+' => 'application',
-	'Class:menuNode/Attribute:type/Value:user' => 'user',
-	'Class:menuNode/Attribute:type/Value:user+' => 'user',
-	'Class:menuNode/Attribute:type/Value:administrator' => 'administrator',
-	'Class:menuNode/Attribute:type/Value:administrator+' => 'administrator',
-	'Class:menuNode/Attribute:rank' => 'Display rank',
-	'Class:menuNode/Attribute:rank+' => 'Sort order for displaying the menu',
-	'Class:menuNode/Attribute:parent_id' => 'Parent Menu Item',
-	'Class:menuNode/Attribute:parent_id+' => 'Parent Menu Item',
-	'Class:menuNode/Attribute:parent_name' => 'Parent Menu Item',
-	'Class:menuNode/Attribute:parent_name+' => 'Parent Menu Item',
-	'Class:menuNode/Attribute:user_id' => 'Owner of the menu',
-	'Class:menuNode/Attribute:user_id+' => 'User who owns this menu (for user defined menus)',
-));
-
 //////////////////////////////////////////////////////////////////////
 // Classes in 'application'
 //////////////////////////////////////////////////////////////////////
@@ -121,6 +86,8 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:User' => 'User',
 	'Class:User+' => 'User login',
+	'Class:User/Attribute:finalclass' => 'Type of account',
+	'Class:User/Attribute:finalclass+' => '',
 	'Class:User/Attribute:contactid' => 'Contact (person)',
 	'Class:User/Attribute:contactid+' => 'Personal details from the business data',
 	'Class:User/Attribute:last_name' => 'Last name',
@@ -134,43 +101,14 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:User/Attribute:language' => 'Language',
 	'Class:User/Attribute:language+' => 'user language',
 	'Class:User/Attribute:language/Value:EN US' => 'English',
-	'Class:User/Attribute:language/Value:EN US+' => 'English U.S.',
+	'Class:User/Attribute:language/Value:EN US+' => 'English (U.S.)',
 	'Class:User/Attribute:language/Value:FR FR' => 'French',
-	'Class:User/Attribute:language/Value:FR FR+' => 'FR FR',
+	'Class:User/Attribute:language/Value:FR FR+' => 'French (France)',
 	'Class:User/Attribute:profile_list' => 'Profiles',
 	'Class:User/Attribute:profile_list+' => 'Roles, granting rights for that person',
 ));
 
 //
-// Class: UserLocal
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:UserLocal' => 'iTop user',
-	'Class:UserLocal+' => 'User authentified by iTop',
-	'Class:UserLocal/Attribute:contactid' => 'Contact (person)',
-	'Class:UserLocal/Attribute:contactid+' => 'Personal details from the business data',
-	'Class:UserLocal/Attribute:last_name' => 'Last name',
-	'Class:UserLocal/Attribute:last_name+' => 'Name of the corresponding contact',
-	'Class:UserLocal/Attribute:first_name' => 'First name',
-	'Class:UserLocal/Attribute:first_name+' => 'First name of the corresponding contact',
-	'Class:UserLocal/Attribute:email' => 'Email',
-	'Class:UserLocal/Attribute:email+' => 'Email of the corresponding contact',
-	'Class:UserLocal/Attribute:login' => 'Login',
-	'Class:UserLocal/Attribute:login+' => 'user identification string',
-	'Class:UserLocal/Attribute:password' => 'Password',
-	'Class:UserLocal/Attribute:password+' => 'user authentication string',
-	'Class:UserLocal/Attribute:language' => 'Language',
-	'Class:UserLocal/Attribute:language+' => 'user language',
-	'Class:UserLocal/Attribute:language/Value:EN US' => 'English',
-	'Class:UserLocal/Attribute:language/Value:EN US+' => 'English U.S.',
-	'Class:UserLocal/Attribute:language/Value:FR FR' => 'French',
-	'Class:UserLocal/Attribute:language/Value:FR FR+' => 'FR FR',
-	'Class:UserLocal/Attribute:profile_list' => 'Profiles',
-	'Class:UserLocal/Attribute:profile_list+' => 'Roles, granting rights for that person',
-));
-
-//
 // Class: URP_Profiles
 //
 

+ 23 - 23
dictionaries/fr.dictionary.itop.core.php

@@ -33,7 +33,7 @@
 // Class: CMDBChange
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:CMDBChange' => 'change',
 	'Class:CMDBChange+' => 'Changes tracking',
 	'Class:CMDBChange/Attribute:date' => 'date',
@@ -46,7 +46,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: CMDBChangeOp
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:CMDBChangeOp' => 'change operation',
 	'Class:CMDBChangeOp+' => 'Change operations tracking',
 	'Class:CMDBChangeOp/Attribute:change' => 'change',
@@ -67,7 +67,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: CMDBChangeOpCreate
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:CMDBChangeOpCreate' => 'object creation',
 	'Class:CMDBChangeOpCreate+' => 'Object creation tracking',
 ));
@@ -76,7 +76,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: CMDBChangeOpDelete
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:CMDBChangeOpDelete' => 'object deletion',
 	'Class:CMDBChangeOpDelete+' => 'Object deletion tracking',
 ));
@@ -85,7 +85,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: CMDBChangeOpSetAttribute
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:CMDBChangeOpSetAttribute' => 'object change',
 	'Class:CMDBChangeOpSetAttribute+' => 'Object properties change tracking',
 	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Attribute',
@@ -96,7 +96,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: CMDBChangeOpSetAttributeScalar
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:CMDBChangeOpSetAttributeScalar' => 'property change',
 	'Class:CMDBChangeOpSetAttributeScalar+' => 'Object scalar properties change tracking',
 	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Previous value',
@@ -109,7 +109,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: CMDBChangeOpSetAttributeBlob
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:CMDBChangeOpSetAttributeBlob' => 'data change',
 	'Class:CMDBChangeOpSetAttributeBlob+' => 'data change tracking',
 	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Previous data',
@@ -120,7 +120,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: CMDBChangeOpSetAttributeText
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:CMDBChangeOpSetAttributeText' => 'text change',
 	'Class:CMDBChangeOpSetAttributeText+' => 'text change tracking',
 	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Previous data',
@@ -131,7 +131,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: Event
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:Event' => 'Log Event',
 	'Class:Event+' => 'An application internal event',
 	'Class:Event/Attribute:message' => 'message',
@@ -148,7 +148,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: EventNotification
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:EventNotification' => 'Notification event',
 	'Class:EventNotification+' => 'Trace of a notification that has been sent',
 	'Class:EventNotification/Attribute:trigger_id' => 'Trigger',
@@ -163,7 +163,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: EventNotificationEmail
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:EventNotificationEmail' => 'Email emission event',
 	'Class:EventNotificationEmail+' => 'Trace of an email that has been sent',
 	'Class:EventNotificationEmail/Attribute:to' => 'TO',
@@ -184,7 +184,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: EventIssue
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:EventIssue' => 'Issue event',
 	'Class:EventIssue+' => 'Trace of an issue (warning, error, etc.)',
 	'Class:EventIssue/Attribute:issue' => 'Issue',
@@ -207,7 +207,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: EventWebService
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:EventWebService' => 'Web service event',
 	'Class:EventWebService+' => 'Trace of an web service call',
 	'Class:EventWebService/Attribute:verb' => 'Verb',
@@ -228,7 +228,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: Action
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:Action' => 'action',
 	'Class:Action+' => 'Custom action',
 	'Class:Action/Attribute:name' => 'Name',
@@ -253,7 +253,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: ActionNotification
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:ActionNotification' => 'notification',
 	'Class:ActionNotification+' => 'Notification (abstract)',
 ));
@@ -262,7 +262,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: ActionEmail
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:ActionEmail' => 'email notification',
 	'Class:ActionEmail+' => 'Action: Email notification',
 	'Class:ActionEmail/Attribute:test_recipient' => 'Test recipient',
@@ -295,7 +295,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: Trigger
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:Trigger' => 'trigger',
 	'Class:Trigger+' => 'Custom event handler',
 	'Class:Trigger/Attribute:description' => 'Description',
@@ -310,7 +310,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: TriggerOnObject
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:TriggerOnObject' => 'Trigger on a class of objects',
 	'Class:TriggerOnObject+' => 'Trigger on a given class of objects',
 	'Class:TriggerOnObject/Attribute:target_class' => 'Target class',
@@ -321,7 +321,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: TriggerOnStateChange
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:TriggerOnStateChange' => 'Trigger on object state change',
 	'Class:TriggerOnStateChange+' => 'Trigger on object state change',
 	'Class:TriggerOnStateChange/Attribute:state' => 'State',
@@ -332,7 +332,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: TriggerOnStateEnter
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:TriggerOnStateEnter' => 'Trigger on object entering a state',
 	'Class:TriggerOnStateEnter+' => 'Trigger on object state change - entering',
 ));
@@ -341,7 +341,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: TriggerOnStateLeave
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:TriggerOnStateLeave' => 'Trigger on object leaving a state',
 	'Class:TriggerOnStateLeave+' => 'Trigger on object state change - leaving',
 ));
@@ -350,7 +350,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: TriggerOnObjectCreate
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:TriggerOnObjectCreate' => 'Trigger on object creation',
 	'Class:TriggerOnObjectCreate+' => 'Trigger on object creation of [a child class of] the given class',
 ));
@@ -359,7 +359,7 @@ Dict::Add('EN US', 'English', 'English', array(
 // Class: lnkTriggerAction
 //
 
-Dict::Add('EN US', 'English', 'English', array(
+Dict::Add('EN US', 'French', 'Français', array(
 	'Class:lnkTriggerAction' => 'Actions-Trigger',
 	'Class:lnkTriggerAction+' => 'Link between a trigger and an action',
 	'Class:lnkTriggerAction/Attribute:action_id' => 'Action',

+ 11 - 61
dictionaries/fr.dictionary.itop.ui.php

@@ -29,41 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: menuNode
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:menuNode' => 'menuNode',
-	'Class:menuNode+' => 'Main menu configuration elements',
-	'Class:menuNode/Attribute:name' => 'Menu Name',
-	'Class:menuNode/Attribute:name+' => 'Short name for this menu',
-	'Class:menuNode/Attribute:label' => 'Menu Description',
-	'Class:menuNode/Attribute:label+' => 'Long description for this menu',
-	'Class:menuNode/Attribute:hyperlink' => 'Hyperlink',
-	'Class:menuNode/Attribute:hyperlink+' => 'Hyperlink to the page',
-	'Class:menuNode/Attribute:icon_path' => 'Menu Icon',
-	'Class:menuNode/Attribute:icon_path+' => 'Path to the icon o the menu',
-	'Class:menuNode/Attribute:template' => 'Template',
-	'Class:menuNode/Attribute:template+' => 'HTML template for the view',
-	'Class:menuNode/Attribute:type' => 'Type',
-	'Class:menuNode/Attribute:type+' => 'Type of menu',
-	'Class:menuNode/Attribute:type/Value:application' => 'application',
-	'Class:menuNode/Attribute:type/Value:application+' => 'application',
-	'Class:menuNode/Attribute:type/Value:user' => 'user',
-	'Class:menuNode/Attribute:type/Value:user+' => 'user',
-	'Class:menuNode/Attribute:type/Value:administrator' => 'administrator',
-	'Class:menuNode/Attribute:type/Value:administrator+' => 'administrator',
-	'Class:menuNode/Attribute:rank' => 'Display rank',
-	'Class:menuNode/Attribute:rank+' => 'Sort order for displaying the menu',
-	'Class:menuNode/Attribute:parent_id' => 'Parent Menu Item',
-	'Class:menuNode/Attribute:parent_id+' => 'Parent Menu Item',
-	'Class:menuNode/Attribute:parent_name' => 'Parent Menu Item',
-	'Class:menuNode/Attribute:parent_name+' => 'Parent Menu Item',
-	'Class:menuNode/Attribute:user_id' => 'Owner of the menu',
-	'Class:menuNode/Attribute:user_id+' => 'User who owns this menu (for user defined menus)',
-));
-
 //////////////////////////////////////////////////////////////////////
 // Classes in 'application'
 //////////////////////////////////////////////////////////////////////
@@ -118,9 +83,11 @@ Dict::Add('FR FR', 'French', 'Français', array(
 // Class: User
 //
 
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:User' => 'Compte utilisateur',
-	'Class:User+' => 'Login utilisateur',
+Dict::Add('EN US', 'French', 'Français', array(
+	'Class:User' => 'Utilisateur',
+	'Class:User+' => 'Compte utilisateur',
+	'Class:User/Attribute:finalclass' => 'Type de compte',
+	'Class:User/Attribute:finalclass+' => '',
 	'Class:User/Attribute:contactid' => 'Contact (personne)',
 	'Class:User/Attribute:contactid+' => '',
 	'Class:User/Attribute:last_name' => 'Nom',
@@ -131,34 +98,17 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:User/Attribute:email+' => '',
 	'Class:User/Attribute:login' => 'Login',
 	'Class:User/Attribute:login+' => '',
+	'Class:User/Attribute:language' => 'Langue',
+	'Class:User/Attribute:language+' => '',
+	'Class:User/Attribute:language/Value:EN US' => 'Anglais',
+	'Class:User/Attribute:language/Value:EN US+' => 'Anglais (Etats-unis)',
+	'Class:User/Attribute:language/Value:FR FR' => 'Français',
+	'Class:User/Attribute:language/Value:FR FR+' => 'Français (France)',
 	'Class:User/Attribute:profile_list' => 'Profils',
 	'Class:User/Attribute:profile_list+' => 'Rôles, ouvrants les droits d\'accès',
 ));
 
 //
-// Class: UserLocal
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:UserLocal' => 'Utilisateur iTop',
-	'Class:UserLocal+' => 'Utilisateur authentifié par iTop',
-	'Class:UserLocal/Attribute:contactid' => 'Contact (personne)',
-	'Class:UserLocal/Attribute:contactid+' => '',
-	'Class:UserLocal/Attribute:last_name' => 'Nom',
-	'Class:UserLocal/Attribute:last_name+' => '',
-	'Class:UserLocal/Attribute:first_name' => 'Prénom',
-	'Class:UserLocal/Attribute:first_name+' => '',
-	'Class:UserLocal/Attribute:email' => 'Adresse email',
-	'Class:UserLocal/Attribute:email+' => '',
-	'Class:UserLocal/Attribute:login' => 'Login',
-	'Class:UserLocal/Attribute:login+' => '',
-	'Class:UserLocal/Attribute:password' => 'Mot de passe',
-	'Class:UserLocal/Attribute:password+' => '',
-	'Class:UserLocal/Attribute:profile_list' => 'Profils',
-	'Class:UserLocal/Attribute:profile_list+' => 'Rôles, ouvrants les droits d\'accès',
-));
-
-//
 // Class: URP_Profiles
 //
 

+ 30 - 0
modules/authent-ldap/en.dict.authent-ldap.php

@@ -33,5 +33,35 @@
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
 
+//
+// Class: UserLDAP
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:UserLDAP' => 'LDAP user',
+	'Class:UserLDAP+' => 'User authentified by LDAP',
+	'Class:UserLDAP/Attribute:contactid' => 'Contact (person)',
+	'Class:UserLDAP/Attribute:contactid+' => 'Personal details from the business data',
+	'Class:UserLDAP/Attribute:last_name' => 'Last name',
+	'Class:UserLDAP/Attribute:last_name+' => 'Name of the corresponding contact',
+	'Class:UserLDAP/Attribute:first_name' => 'First name',
+	'Class:UserLDAP/Attribute:first_name+' => 'First name of the corresponding contact',
+	'Class:UserLDAP/Attribute:email' => 'Email',
+	'Class:UserLDAP/Attribute:email+' => 'Email of the corresponding contact',
+	'Class:UserLDAP/Attribute:login' => 'Login',
+	'Class:UserLDAP/Attribute:login+' => 'user identification string',
+	'Class:UserLDAP/Attribute:password' => 'Password',
+	'Class:UserLDAP/Attribute:password+' => 'user authentication string',
+	'Class:UserLDAP/Attribute:language' => 'Language',
+	'Class:UserLDAP/Attribute:language+' => 'user language',
+	'Class:UserLDAP/Attribute:language/Value:EN US' => 'English',
+	'Class:UserLDAP/Attribute:language/Value:EN US+' => 'English (U.S.)',
+	'Class:UserLDAP/Attribute:language/Value:FR FR' => 'French',
+	'Class:UserLDAP/Attribute:language/Value:FR FR+' => 'French (France)',
+	'Class:UserLDAP/Attribute:profile_list' => 'Profiles',
+	'Class:UserLDAP/Attribute:profile_list+' => 'Roles, granting rights for that person',
+));
+
+
 
 ?>

+ 65 - 0
modules/authent-ldap/fr.dict.authent-ldap.php

@@ -0,0 +1,65 @@
+<?php
+// Copyright (C) 2010 Combodo SARL
+//
+//   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; version 3 of the License.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program; if not, write to the Free Software
+//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+/**
+ * Localized data
+ *
+ * @author      Erwan Taloc <erwan.taloc@combodo.com>
+ * @author      Romain Quetiez <romain.quetiez@combodo.com>
+ * @author      Denis Flaven <denis.flaven@combodo.com>
+ * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserLDAP
+//
+
+Dict::Add('EN US', 'French', 'Français', array(
+	'Class:UserLDAP' => 'Utilisateur iTop',
+	'Class:UserLDAP+' => 'Utilisateur authentifié par iTop',
+	'Class:UserLDAP/Attribute:contactid' => 'Contact (personne)',
+	'Class:UserLDAP/Attribute:contactid+' => '',
+	'Class:UserLDAP/Attribute:last_name' => 'Nom',
+	'Class:UserLDAP/Attribute:last_name+' => '',
+	'Class:UserLDAP/Attribute:first_name' => 'Prénom',
+	'Class:UserLDAP/Attribute:first_name+' => '',
+	'Class:UserLDAP/Attribute:email' => 'Adresse email',
+	'Class:UserLDAP/Attribute:email+' => '',
+	'Class:UserLDAP/Attribute:login' => 'Login',
+	'Class:UserLDAP/Attribute:login+' => '',
+	'Class:UserLDAP/Attribute:password' => 'Mot de passe LDAP',
+	'Class:UserLDAP/Attribute:password+' => '',
+	'Class:UserLDAP/Attribute:language' => 'Language',
+	'Class:UserLDAP/Attribute:language+' => '',
+	'Class:UserLDAP/Attribute:language/Value:EN US' => 'Anglais',
+	'Class:UserLDAP/Attribute:language/Value:EN US+' => 'Anglais (Etats-unis)',
+	'Class:UserLDAP/Attribute:language/Value:FR FR' => 'Français',
+	'Class:UserLDAP/Attribute:language/Value:FR FR+' => 'Français (France)',
+	'Class:UserLDAP/Attribute:profile_list' => 'Profils',
+	'Class:UserLDAP/Attribute:profile_list+' => 'Rôles, ouvrants les droits d\'accès',
+));
+
+?>

+ 8 - 0
modules/authent-ldap/module.authent-ldap.php

@@ -1,6 +1,12 @@
 <?php
 
 
+// Until we develop a mean to adress this within the setup, let's check that this instance
+// of PHP has the php_ldap extension
+//
+if (function_exists('ldap_connect'))
+{
+
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
 	'authent-ldap',
@@ -57,4 +63,6 @@ SetupWebPage::AddModule(
 	)
 );
 
+} // if (function_exists('ldap_connect'))
+
 ?>

+ 30 - 0
modules/authent-local/en.dict.authent-local.php

@@ -33,5 +33,35 @@
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
 
+//
+// Class: UserLocal
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:UserLocal' => 'iTop user',
+	'Class:UserLocal+' => 'User authentified by iTop',
+	'Class:UserLocal/Attribute:contactid' => 'Contact (person)',
+	'Class:UserLocal/Attribute:contactid+' => 'Personal details from the business data',
+	'Class:UserLocal/Attribute:last_name' => 'Last name',
+	'Class:UserLocal/Attribute:last_name+' => 'Name of the corresponding contact',
+	'Class:UserLocal/Attribute:first_name' => 'First name',
+	'Class:UserLocal/Attribute:first_name+' => 'First name of the corresponding contact',
+	'Class:UserLocal/Attribute:email' => 'Email',
+	'Class:UserLocal/Attribute:email+' => 'Email of the corresponding contact',
+	'Class:UserLocal/Attribute:login' => 'Login',
+	'Class:UserLocal/Attribute:login+' => 'user identification string',
+	'Class:UserLocal/Attribute:password' => 'Password',
+	'Class:UserLocal/Attribute:password+' => 'user authentication string',
+	'Class:UserLocal/Attribute:language' => 'Language',
+	'Class:UserLocal/Attribute:language+' => 'user language',
+	'Class:UserLocal/Attribute:language/Value:EN US' => 'English',
+	'Class:UserLocal/Attribute:language/Value:EN US+' => 'English (U.S.)',
+	'Class:UserLocal/Attribute:language/Value:FR FR' => 'French',
+	'Class:UserLocal/Attribute:language/Value:FR FR+' => 'French (France)',
+	'Class:UserLocal/Attribute:profile_list' => 'Profiles',
+	'Class:UserLocal/Attribute:profile_list+' => 'Roles, granting rights for that person',
+));
+
+
 
 ?>

+ 65 - 0
modules/authent-local/fr.dict.authent-local.php

@@ -0,0 +1,65 @@
+<?php
+// Copyright (C) 2010 Combodo SARL
+//
+//   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; version 3 of the License.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program; if not, write to the Free Software
+//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+/**
+ * Localized data
+ *
+ * @author      Erwan Taloc <erwan.taloc@combodo.com>
+ * @author      Romain Quetiez <romain.quetiez@combodo.com>
+ * @author      Denis Flaven <denis.flaven@combodo.com>
+ * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserLocal
+//
+
+Dict::Add('EN US', 'French', 'Français', array(
+	'Class:UserLocal' => 'Utilisateur iTop',
+	'Class:UserLocal+' => 'Utilisateur authentifié par iTop',
+	'Class:UserLocal/Attribute:contactid' => 'Contact (personne)',
+	'Class:UserLocal/Attribute:contactid+' => '',
+	'Class:UserLocal/Attribute:last_name' => 'Nom',
+	'Class:UserLocal/Attribute:last_name+' => '',
+	'Class:UserLocal/Attribute:first_name' => 'Prénom',
+	'Class:UserLocal/Attribute:first_name+' => '',
+	'Class:UserLocal/Attribute:email' => 'Adresse email',
+	'Class:UserLocal/Attribute:email+' => '',
+	'Class:UserLocal/Attribute:login' => 'Login',
+	'Class:UserLocal/Attribute:login+' => '',
+	'Class:UserLocal/Attribute:password' => 'Mot de passe',
+	'Class:UserLocal/Attribute:password+' => '',
+	'Class:UserLocal/Attribute:language' => 'Language',
+	'Class:UserLocal/Attribute:language+' => '',
+	'Class:UserLocal/Attribute:language/Value:EN US' => 'Anglais',
+	'Class:UserLocal/Attribute:language/Value:EN US+' => 'Anglais (Etats-unis)',
+	'Class:UserLocal/Attribute:language/Value:FR FR' => 'Français',
+	'Class:UserLocal/Attribute:language/Value:FR FR+' => 'Français (France)',
+	'Class:UserLocal/Attribute:profile_list' => 'Profils',
+	'Class:UserLocal/Attribute:profile_list+' => 'Rôles, ouvrants les droits d\'accès',
+));
+
+?>