diff --git a/dictionaries/dictionary.itop.core.php b/dictionaries/dictionary.itop.core.php index 876868c25..1de4fd194 100644 --- a/dictionaries/dictionary.itop.core.php +++ b/dictionaries/dictionary.itop.core.php @@ -526,14 +526,12 @@ Dict::Add('EN US', 'English', 'English', array( 'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Syntax: field_name:value; ...', 'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Retention Duration', 'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'How much time an obsolete object is kept before being deleted', - 'SynchroDataSource:Description' => 'Description', 'SynchroDataSource:Reconciliation' => 'Search & reconciliation', 'SynchroDataSource:Deletion' => 'Deletion rules', 'SynchroDataSource:Status' => 'Status', 'SynchroDataSource:Information' => 'Information', - - + 'SynchroDataSource:Definition' => 'Definition', 'Core:SynchroAttributes' => 'Attributes', 'Core:SynchroStatus' => 'Status', 'Core:Synchro:ErrorsLabel' => 'Errors', @@ -598,6 +596,11 @@ Dict::Add('EN US', 'English', 'English', array( 'Core:Synchro:TheObjectWasCreatedBy_Source' => 'The object was created by the external data source %1$s', 'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'The object can be deleted by the external data source %1$s', 'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'You cannot delete the object because it is owned by the external data source %1$s', + 'TitleSynchroExecution' => 'Execution of the synchronization', + 'Class:SynchroDataSource:DataTable' => 'Database table: %1$s', + 'Core:SyncDataSourceObsolete' => 'The data source is marked as obsolete. Operation cancelled.', + 'Core:SyncDataSourceAccessRestriction' => 'Only adminstrators or the user specified in the data source can execute this operation. Operation cancelled.', + 'Core:SyncTooManyMissingReplicas' => 'All replicas are missing from import. Did the import actually run? Operation cancelled.', )); // diff --git a/dictionaries/dictionary.itop.ui.php b/dictionaries/dictionary.itop.ui.php index 3e81a2a77..838eb9453 100644 --- a/dictionaries/dictionary.itop.ui.php +++ b/dictionaries/dictionary.itop.ui.php @@ -911,5 +911,9 @@ When associated with a trigger, each action is given an "order" number, specifyi 'UI:CaseLog:DateFormat' => 'Y-m-d H:i:s', 'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:', 'UI:CaseLog:InitialValue' => 'Initial value:', + 'UI:AttemptingToSetASlaveAttribute_Name' => 'The field %1$s is not writable because it is mastered by the data synchronization. Value not set.', + 'UI:ActionNotAllowed' => 'You are not allowed to perform this action on these objects.', + 'UI:BulkAction:NoObjectSelected' => 'Please select at least one object to perform this operation', + 'UI:AttemptingToChangeASlaveAttribute_Name' => 'The field %1$s is not writable because it is mastered by the data synchronization. Value remains unchanged.', )); ?>