Updated data model and dictionary (FR)

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@587 a333f486-631f-4898-b8df-5754b55c2be0

dictionaries/fr.dictionary.itop.ui.php

@@ -645,7 +645,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:CreationTitle_Class' => 'Création d\'un objet de type %1$s',
 	'UI:SelectTheTypeOf_Class_ToCreate' => 'Sélectionnez le type de %1$s à créer :',
 	'UI:Class_Object_NotUpdated' => 'Aucun changement détecté, %2$s (type : %2$s) n\'a <strong>pas</strong> été modifié.',
-	'UI:Class_Object_Updated' => '%1$s (%2$s) mise à jour.',
+	'UI:Class_Object_Updated' => '%1$s (%2$s) - informations mises à jour.',
 	'UI:BulkDeletePageTitle' => 'iTop - Suppression massive',
 	'UI:BulkDeleteTitle' => 'Sélectionnez les objets à supprimer:',
 	'UI:PageTitle:ObjectCreated' => 'iTop objet créé.',

modules/itop-change-mgmt-1.0.0/en.dict.itop-change-mgmt.php

@@ -33,8 +33,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'Opened changes',
 	'Menu:Changes+' => '',
-	'Menu:MyChanges' => 'My changes',
-	'Menu:MyChanges+' => '',
+	'Menu:MyChanges' => 'Changes assigned to me',
+	'Menu:MyChanges+' => 'Changes assigned to me (as Agent)',
 ));
 
 // Dictionnay conventions
@@ -71,7 +71,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Change/Attribute:status/Value:plannedscheduled+' => '',
 	'Class:Change/Attribute:status/Value:approved' => 'Approved',
 	'Class:Change/Attribute:status/Value:approved+' => '',
-	'Class:Change/Attribute:status/Value:notapproved' => 'Rejected',
+	'Class:Change/Attribute:status/Value:notapproved' => 'Not approved',
 	'Class:Change/Attribute:status/Value:notapproved+' => '',
 	'Class:Change/Attribute:status/Value:implemented' => 'Implemented',
 	'Class:Change/Attribute:status/Value:implemented+' => '',
@@ -251,7 +251,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:NormalChange/Attribute:status/Value:plannedscheduled+' => '',
 	'Class:NormalChange/Attribute:status/Value:approved' => 'Approved',
 	'Class:NormalChange/Attribute:status/Value:approved+' => '',
-	'Class:NormalChange/Attribute:status/Value:notapproved' => 'Rejected',
+	'Class:NormalChange/Attribute:status/Value:notapproved' => 'Not approved',
 	'Class:NormalChange/Attribute:status/Value:notapproved+' => '',
 	'Class:NormalChange/Attribute:status/Value:implemented' => 'Implemented',
 	'Class:NormalChange/Attribute:status/Value:implemented+' => '',
@@ -306,7 +306,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:EmergencyChange/Attribute:status/Value:plannedscheduled+' => '',
 	'Class:EmergencyChange/Attribute:status/Value:approved' => 'Approved',
 	'Class:EmergencyChange/Attribute:status/Value:approved+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:notapproved' => 'Rejected',
+	'Class:EmergencyChange/Attribute:status/Value:notapproved' => 'Not approved',
 	'Class:EmergencyChange/Attribute:status/Value:notapproved+' => '',
 	'Class:EmergencyChange/Attribute:status/Value:implemented' => 'Implemented',
 	'Class:EmergencyChange/Attribute:status/Value:implemented+' => '',

modules/itop-change-mgmt-1.0.0/fr.dict.itop-change-mgmt.php

@@ -31,10 +31,10 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => 'Tickets en attente d\'approbation',
 	'Menu:WaitingApproval+' => '',
-	'Menu:Changes' => 'Ticket ouverts',
-	'Menu:Changes+' => '',
+	'Menu:Changes' => 'Tickets ouverts',
+	'Menu:Changes+' => 'Tickets de changement ouverts',
 	'Menu:MyChanges' => 'Mes tickets',
-	'Menu:MyChanges+' => '',
+	'Menu:MyChanges+' => 'Tickets de changement qui me sont assignés',
 ));
 
 // Dictionnay conventions
@@ -53,7 +53,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:Change' => 'Ticket de changements',
+	'Class:Change' => 'Ticket de changement',
 	'Class:Change+' => '',
 	'Class:Change/Attribute:start_date' => 'Début de l\'intervention',
 	'Class:Change/Attribute:start_date+' => '',
@@ -165,7 +165,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:RoutineChange' => 'Routine Change',
+	'Class:RoutineChange' => 'Ticket de Changement de Routine',
 	'Class:RoutineChange+' => '',
 	'Class:RoutineChange/Attribute:status/Value:new' => 'Nouveau',
 	'Class:RoutineChange/Attribute:status/Value:new+' => '',
@@ -238,7 +238,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:NormalChange' => 'Normal Change',
+	'Class:NormalChange' => 'Ticket de Changement',
 	'Class:NormalChange+' => '',
 	'Class:NormalChange/Attribute:status/Value:new' => 'Nouveau',
 	'Class:NormalChange/Attribute:status/Value:new+' => '',
@@ -293,7 +293,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:EmergencyChange' => 'Emergency Change',
+	'Class:EmergencyChange' => 'Ticket de Changement d\'Urgence',
 	'Class:EmergencyChange+' => '',
 	'Class:EmergencyChange/Attribute:status/Value:new' => 'New',
 	'Class:EmergencyChange/Attribute:status/Value:new+' => '',

modules/itop-change-mgmt-1.0.0/model.itop-change-mgmt.php

@@ -160,6 +160,7 @@ abstract class Change extends Ticket
 					'manager_group_id' => OPT_ATT_MANDATORY,
 					'manager_id' => OPT_ATT_MANDATORY,
 					'fallback' => OPT_ATT_MANDATORY,
+					'outage' => OPT_ATT_MUSTPROMPT,
 				),
 			)
 		);

modules/itop-incident-mgmt-1.0.0/en.dict.itop-incident-mgmt.php

@@ -28,8 +28,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Menu:IncidentManagement+' => 'Incident Management',
 	'Menu:Incident:Overview' => 'Overview',
 	'Menu:Incident:Overview+' => 'Overview',
-	'Menu:Incident:MyIncidents' => 'My Incidents',
-	'Menu:Incident:MyIncidents+' => 'My Incidents',
+	'Menu:Incident:MyIncidents' => 'Incidents assigned to me',
+	'Menu:Incident:MyIncidents+' => 'Incidents assigned to me (as Agent)',
 	'Menu:Incident:EscalatedIncidents' => 'Escalated Incidents',
 	'Menu:Incident:EscalatedIncidents+' => 'Escalated Incidents',
 	'Menu:Incident:OpenIncidents' => 'All Open Incidents',

modules/itop-incident-mgmt-1.0.0/fr.dict.itop-incident-mgmt.php

@@ -29,7 +29,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:Incident:Overview' => 'Vue d\'ensemble',
 	'Menu:Incident:Overview+' => 'Vue d\'ensemble',
 	'Menu:Incident:MyIncidents' => 'Mes tickets',
-	'Menu:Incident:MyIncidents+' => 'Mes tickets d\'incident',
+	'Menu:Incident:MyIncidents+' => 'Tickets d\'incident qui me sont assignés',
 	'Menu:Incident:EscalatedIncidents' => 'Ticket en cours d\'escalade',
 	'Menu:Incident:EscalatedIncidents+' => 'Ticket d\'incident en cours d\'escalade',
 	'Menu:Incident:OpenIncidents' => 'Ticket ouverts',

modules/itop-request-mgmt-1.0.0/en.dict.itop-request-mgmt.php

@@ -28,8 +28,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Menu:RequestManagement+' => 'Helpdesk',
 	'Menu:UserRequest:Overview' => 'Overview',
 	'Menu:UserRequest:Overview+' => 'Overview',
-	'Menu:UserRequest:MyRequests' => 'My Requests',
-	'Menu:UserRequest:MyRequests+' => 'My Requests',
+	'Menu:UserRequest:MyRequests' => 'Requests assigned to me',
+	'Menu:UserRequest:MyRequests+' => 'Requests assigned to me (as Agent)',
 	'Menu:UserRequest:EscalatedRequests' => 'Escalated Requests',
 	'Menu:UserRequest:EscalatedRequests+' => 'Escalated Requests',
 	'Menu:UserRequest:OpenRequests' => 'All Open Requests',

modules/itop-request-mgmt-1.0.0/fr.dict.itop-request-mgmt.php

@@ -29,7 +29,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:UserRequest:Overview' => 'Vue d\'ensemble',
 	'Menu:UserRequest:Overview+' => 'Vue d\'ensemble des demandes utilisateurs',
 	'Menu:UserRequest:MyRequests' => 'Mes demandes',
-	'Menu:UserRequest:MyRequests+' => 'Les demandes utilisateurs qui me sont assignées',
+	'Menu:UserRequest:MyRequests+' => 'Demandes utilisateurs qui me sont assignées',
 	'Menu:UserRequest:EscalatedRequests' => 'Demandes en escalade',
 	'Menu:UserRequest:EscalatedRequests+' => 'Demandes utilisateurs en escalade',
 	'Menu:UserRequest:OpenRequests' => 'Demandes en cours',

modules/itop-tickets-1.0.0/model.itop-tickets.php

@@ -294,8 +294,10 @@ abstract class ResponseTicket extends Ticket
 					'workgroup_id' => OPT_ATT_READONLY,
 					'agent_id' => OPT_ATT_READONLY,
 					'urgency' => OPT_ATT_READONLY,
-					'resolution_code' => OPT_ATT_MANDATORY,
+					'resolution_code' => OPT_ATT_MUSTPROMPT,
 					'solution' => OPT_ATT_MUSTPROMPT,
+					'closure_deadline' => OPT_ATT_READONLY,
+					'escalation_deadline' => OPT_ATT_HIDDEN,
 				),
 			)
 		);
@@ -310,6 +312,7 @@ abstract class ResponseTicket extends Ticket
 					'resolution_code' => OPT_ATT_READONLY,
 					'solution' => OPT_ATT_READONLY,
 					'close_date' => OPT_ATT_READONLY,
+					'closure_deadline' => OPT_ATT_HIDDEN,
 				),
 			)
 		);