diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index c41978587..a841cd695 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -80,9 +80,9 @@ class UILinksWidget
 			$sHTMLValue .= "</script>\n";
 			$oPage->add_at_the_end($this->GetObjectPickerDialog($oPage, $sTargetClass, 'oLinkWidget'.$this->m_iInputId.'.OnOk')); // Forms should not be inside forms
 			$oPage->add_at_the_end($this->GetLinkObjectDialog($oPage, $this->m_iInputId)); // Forms should not be inside forms
-			$sHTMLValue .= "<input type=\"text\" id=\"ac_{$this->m_iInputId}\" size=\"35\" value=\"\" title=\"Type the first 3 characters\"/>";
-			$sHTMLValue .= "<input type=\"button\" id=\"ac_add_{$this->m_iInputId}\" value=\" Add... \"  class=\"action\" onClick=\"oLinkWidget{$this->m_iInputId}.AddObject();\"/>";
-			$sHTMLValue .= "&nbsp;<input type=\"button\" value=\"Browse...\"  class=\"action\" onClick=\"return ManageObjects('$sTitle', '$sTargetClass', '$this->m_iInputId', '$sExtKeyToRemote');\"/>";
+			$sHTMLValue .= "<input type=\"text\" id=\"ac_{$this->m_iInputId}\" size=\"35\" value=\"\" title=\"".Dict::S('UI:LinksWidget:Autocomplete+')."\"/>";
+			$sHTMLValue .= "<input type=\"button\" id=\"ac_add_{$this->m_iInputId}\" value=\"".Dict::S('UI:Button:AddObject')."\"  class=\"action\" onClick=\"oLinkWidget{$this->m_iInputId}.AddObject();\"/>";
+			$sHTMLValue .= "&nbsp;<input type=\"button\" value=\"".Dict::S('UI:Button:BrowseObjects')."\"  class=\"action\" onClick=\"return ManageObjects('$sTitle', '$sTargetClass', '$this->m_iInputId', '$sExtKeyToRemote');\"/>";
 			// another hidden input to store & pass the object's Id
 			$sHTMLValue .= "<input type=\"hidden\" id=\"id_ac_{$this->m_iInputId}\" onChange=\"EnableAddButton('{$this->m_iInputId}');\"/>\n";
 			$sHTMLValue .= "<input type=\"hidden\" id=\"{$this->m_iInputId}\" name=\"attr_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"\"/>\n";
@@ -94,7 +94,7 @@ class UILinksWidget
 		{
 			// Few choices, use a normal 'select'
 			$sHTMLValue = "<select name=\"attr_{$this->m_sAttCode}\"  id=\"{$this->m_iInputId}\">\n";
-			$sHTMLValue .= "<option value=\"0\">--- select a value ---</option>\n";
+			$sHTMLValue .= "<option value=\"0\">".Dict::S('UI:Combo:SelectValue')."</option>\n";
 			if (count($aAllowedValues) > 0)
 			{
 				foreach($aAllowedValues as $key => $value)
@@ -228,6 +228,13 @@ class UILinksWidget
 	
 	protected function GetObjectPickerDialog($oPage, $sTargetClass, $sOkFunction)
 	{
+		$sOkBtnLabel = Dict::S('UI:Button:Ok');
+		$sCancelBtnLabel = Dict::S('UI:Button:Cancel');
+		$sAddBtnLabel = Dict::S('UI:Button:AddToList');
+		$sRemoveBtnLabel = Dict::S('UI:Button:RemoveFromList');
+		$sFilterBtnLabel = Dict::S('UI:Button:FilterList');
+		$sLabelSelectedObjects = Dict::S('UI:Label:SelectedObjects');
+		$sLabelAvailableObjects = Dict::S('UI:Label:AvailableObjects');
 		$sHTML = <<< EOF
 		<div class="jqmWindow" id="ManageObjectsDlg_{$this->m_iInputId}">
 		<div class="wizContainer">
@@ -235,25 +242,25 @@ class UILinksWidget
 		<table width="100%">
 			<tr>
 				<td>
-					<p>Selected objects:</p>
-					<button type="button" class="action" onClick="FilterLeft('$sTargetClass');"><span> Filter... </span></button>
+					<p>$sLabelSelectedObjects</p>
+					<button type="button" class="action" onClick="FilterLeft('$sTargetClass');"><span>$sFilterBtnLabel</span></button>
 					<p><select id="selected_objects_{$this->m_iInputId}" size="10" multiple onChange="Manage_UpdateButtons('$this->m_iInputId')" style="width:300px;">
 					</select></p>
 				</td>
 				<td style="text-align:center; valign:middle;">
-					<p><button type="button" id="btn_add_objects_{$this->m_iInputId}" onClick="Manage_AddObjects('$this->m_iInputId');"> &lt;&lt; Add </button></p>
-					<p><button type="button" id="btn_remove_objects_{$this->m_iInputId}" onClick="Manage_RemoveObjects('$this->m_iInputId');"> Remove &gt;&gt; </button></p>
+					<p><button type="button" id="btn_add_objects_{$this->m_iInputId}" onClick="Manage_AddObjects('$this->m_iInputId');">$sAddBtnLabel</button></p>
+					<p><button type="button" id="btn_remove_objects_{$this->m_iInputId}" onClick="Manage_RemoveObjects('$this->m_iInputId');">$sRemoveBtnLabel</button></p>
 				</td>
 				<td>
-					<p>Available objects:</p>
-					<button type="button" class="action" onClick="FilterRight('$sTargetClass');"><span> Filter... </span></button>
+					<p>$sLabelAvailableObjects</p>
+					<button type="button" class="action" onClick="FilterRight('$sTargetClass');"><span>$sFilterBtnLabel</span></button>
 					<p><select id="available_objects_{$this->m_iInputId}" size="10" multiple onChange="Manage_UpdateButtons('$this->m_iInputId')" style="width:300px;">
 					</select></p>
 				</td>
 			</tr>
 			<tr>
 				<td colspan="3">
-				<input type="submit" class="jqmClose" onClick="$('#ManageObjectsDlg_{$this->m_iInputId}').jqmHide(); $sOkFunction('$sTargetClass', 'selected_objects')" value=" Ok " />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<button type="button" class="jqmClose"> Cancel</button>
+				<input type="submit" class="jqmClose" onClick="$('#ManageObjectsDlg_{$this->m_iInputId}').jqmHide(); $sOkFunction('$sTargetClass', 'selected_objects')" value="$sOkBtnLabel" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<button type="button" class="jqmClose">$sCancelBtnLabel</button>
 				</td>
 			</tr>
 		</table>
@@ -277,7 +284,7 @@ EOF;
 		
 		$sHTML = "<div class=\"jqmWindow\" id=\"LinkDlg_$sId\">\n";
 		$sHTML .= "<div class=\"wizContainer\">\n";
-		$sHTML .= "<div class=\"page_header\"><h1>".MetaModel::GetName($sLinkedClass)." attributes</h1></div>\n";
+		$sHTML .= "<div class=\"page_header\"><h1>".Dict::Format('UI:Link_Class_Attributes', MetaModel::GetName($sLinkedClass))."</h1></div>\n";
 		$sHTML .= "<form action=\"./UI.php\" onSubmit=\"return oLinkWidget$sId.OnLinkOk();\">\n";
 		$index = 0;
 		$aAttrsMap = array();
@@ -318,7 +325,7 @@ EOF;
 			}
 		}
 		$sHTML .= $oPage->GetDetails($aDetails);
-		$sHTML .= "<input type=\"submit\" class=\"jqmClose\" onClick=\"oLinkWidget$sId.OnLinkOk()\" value=\" Ok \" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<button type=\"button\" class=\"jqmClose\"  onClick=\"oLinkWidget$sId.OnLinkCancel()\"> Cancel</button>\n";
+		$sHTML .= "<input type=\"submit\" class=\"jqmClose\" onClick=\"oLinkWidget$sId.OnLinkOk()\" value=\"".Dict::S('UI:Button:Ok')."\" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<button type=\"button\" class=\"jqmClose\"  onClick=\"oLinkWidget$sId.OnLinkCancel()\">".Dict::S('UI:Button:Cancel')."</button>\n";
 		$sHTML .= "</form>\n";
 		$sHTML .= "</div>\n";
 		$sHTML .= "</div>\n";
diff --git a/application/uilinkswizard.class.inc.php b/application/uilinkswizard.class.inc.php
index 6bdb83ecf..b58dca947 100644
--- a/application/uilinkswizard.class.inc.php
+++ b/application/uilinkswizard.class.inc.php
@@ -19,7 +19,7 @@ class UILinksWizard
 		
 		$this->m_aEditableFields = array();
 		$this->m_aTableConfig = array();
-		$this->m_aTableConfig['form::checkbox'] = array( 'label' => "<input class=\"select_all\" type=\"checkbox\" value=\"1\" onChange=\"var value = this.checked; $('.selection').each( function() { this.checked = value; } );OnSelectChange();\">", 'description' => "Select / Deselect All");
+		$this->m_aTableConfig['form::checkbox'] = array( 'label' => "<input class=\"select_all\" type=\"checkbox\" value=\"1\" onChange=\"var value = this.checked; $('.selection').each( function() { this.checked = value; } );OnSelectChange();\">", 'description' => Dict::S('UI:SelectAllToggle+'));
 		foreach(MetaModel::GetAttributesList($this->m_sClass) as $sAttCode)
 		{
 			$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
@@ -46,7 +46,7 @@ class UILinksWizard
 		}
 		if (empty($this->m_sLinkedClass))
 		{
-			throw( new Exception("Incorrect link definition: the class of objects to manage: '$sLinkedClass' was not found as an external key in the class '$sClass'"));
+			throw( new Exception(Dict::Format('UI:Error:IncorrectLinkDefinition_LinkedClass_Class', $sLinkedClass, $sClass)));
 		}
 		foreach(MetaModel::GetZListItems($this->m_sLinkedClass, 'list') as $sFieldCode)
 		{
@@ -71,7 +71,7 @@ class UILinksWizard
 		$oP->add("<input type=\"hidden\" name=\"linkage\" value=\"{$this->m_sLinkageAttr}\">\n");
 		$oP->add("<input type=\"hidden\" name=\"object_id\" value=\"{$this->m_iObjectId}\">\n");
 		$oP->add("<input type=\"hidden\" name=\"linking_attcode\" value=\"{$this->m_sLinkingAttCode}\">\n");
-		$oP->add("<h1>Manage ".MetaModel::GetName($this->m_sLinkedClass)."s linked with ".MetaModel::GetName(get_class($oTargetObj)).": <span class=\"hilite\">".$oTargetObj->GetHyperlink()."</span></h1>\n");
+		$oP->add("<h1>".Dict::Format('UI:ManageObjectsOf_Class_LinkedWith_Class_Instance', MetaModel::GetName($this->m_sLinkedClass), MetaModel::GetName(get_class($oTargetObj)), "<span class=\"hilite\">".$oTargetObj->GetHyperlink()."</span>")."</h1>\n");
 		$oP->add("</div>\n");
 		$oP->add("<script type=\"text/javascript\">\n");
 		$oP->add(
@@ -261,10 +261,10 @@ EOF
 		//var_dump($aTableLabels);
 		//var_dump($aForm);
 		$this->DisplayFormTable($oP, $this->m_aTableConfig, $aForm);
-		$oP->add("<span style=\"float:left;\">&nbsp;&nbsp;&nbsp;<img src=\"../images/tv-item-last.gif\">&nbsp;&nbsp;<input id=\"btnRemove\" type=\"button\" value=\" Remove ".MetaModel::GetName($this->m_sLinkedClass)."s \" onClick=\"RemoveSelected();\" >");
-		$oP->add("&nbsp;&nbsp;&nbsp;<input id=\"btnAdd\" type=\"button\" value=\" Add ".MetaModel::GetName($this->m_sLinkedClass)."s... \" onClick=\"AddObjects();\"></span>\n");
-		$oP->add("<span style=\"float:right;\"><input id=\"btnCancel\" type=\"button\" value=\" Cancel \" onClick=\"goBack();\">");
-		$oP->add("&nbsp;&nbsp;&nbsp;<input id=\"btnOk\" type=\"submit\" value=\" Ok \"></span>\n");
+		$oP->add("<span style=\"float:left;\">&nbsp;&nbsp;&nbsp;<img src=\"../images/tv-item-last.gif\">&nbsp;&nbsp;<input id=\"btnRemove\" type=\"button\" value=\"".Dict::S('UI:RemoveLinkedObjectsOf_Class')."\" onClick=\"RemoveSelected();\" >");
+		$oP->add("&nbsp;&nbsp;&nbsp;<input id=\"btnAdd\" type=\"button\" value=\"".Dict::Format('UI:AddLinkedObjectsOf_Class', MetaModel::GetName($this->m_sLinkedClass))."\" onClick=\"AddObjects();\"></span>\n");
+		$oP->add("<span style=\"float:right;\"><input id=\"btnCancel\" type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"goBack();\">");
+		$oP->add("&nbsp;&nbsp;&nbsp;<input id=\"btnOk\" type=\"submit\" value=\"".Dict::S('UI:Button:Ok')."\"></span>\n");
 		$oP->add("<span style=\"clear:both;\"><p>&nbsp;</p></span>\n");
 		$oP->add("</div>\n");
 		$oP->add("</form>\n");
@@ -325,7 +325,7 @@ EOF
 		$oP->add("</tbody>\n");
 		if (count($aData) == 0)
 		{
-			$oP->add("<tr id=\"empty_row\"><td colspan=\"".count($aConfig)."\" style=\"text-align:center;\">The list is empty, use 'Add...' to add elements.</td></td>");
+			$oP->add("<tr id=\"empty_row\"><td colspan=\"".count($aConfig)."\" style=\"text-align:center;\">".Dict::S('UI:Message:EmptyList:UseAdd')."</td></td>");
 		}
 		else
 		{
@@ -357,7 +357,7 @@ EOF
 		$oTargetObj = $oContext->GetObject($sTargetClass, $this->m_iObjectId);
 		$oP->add("<div class=\"wizContainer\">\n");
 		$oP->add("<div class=\"page_header\">\n");
-		$oP->add("<h1>Add ".MetaModel::GetName($this->m_sLinkedClass)."s to ".MetaModel::GetName(get_class($oTargetObj)).": <span class=\"hilite\">".$oTargetObj->GetHyperlink()."</span></h1>\n");
+		$oP->add("<h1>".Dict::Format('UI:AddObjectsOf_Class_LinkedWith_Class_Instance', MetaModel::GetName($this->m_sLinkedClass), MetaModel::GetName(get_class($oTargetObj)), "<span class=\"hilite\">".$oTargetObj->GetHyperlink()."</span>")."</h1>\n");
 		$oP->add("</div>\n");
 
 		$oFilter = $oContext->NewFilter($this->m_sLinkedClass);
@@ -366,9 +366,9 @@ EOF
 		$oBlock->Display($oP, 'SearchFormToAdd', array('open' => true));
 		$oP->Add("<form id=\"ObjectsAddForm\" OnSubmit=\"return DoAddObjects(this.id);\">\n");
 		$oP->Add("<div id=\"SearchResultsToAdd\">\n");
-		$oP->Add("<div style=\"height: 100px; background: #fff;border-color:#F6F6F1 #E6E6E1 #E6E6E1 #F6F6F1; border-style:solid; border-width:3px; text-align: center; vertical-align: center;\"><p>Use the search form above to search for objects to be added.</p></div>\n");
+		$oP->Add("<div style=\"height: 100px; background: #fff;border-color:#F6F6F1 #E6E6E1 #E6E6E1 #F6F6F1; border-style:solid; border-width:3px; text-align: center; vertical-align: center;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n");
 		$oP->Add("</div>\n");
-		$oP->add("<input type=\"button\" value=\"Cancel\" onClick=\"$('#ModalDlg').jqmHide();\">&nbsp;&nbsp;<input type=\"submit\" value=\" Add \">");
+		$oP->add("<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#ModalDlg').jqmHide();\">&nbsp;&nbsp;<input type=\"submit\" value=\"".Dict::S('UI:Button:Add')."\">");
 		$oP->Add("</div>\n");
 		$oP->Add("</form>\n");
 		$oP->add_ready_script("$('div#SearchFormToAdd form').bind('submit.uilinksWizard', SubmitHook);");
@@ -400,7 +400,7 @@ EOF
 			}
 			else
 			{
-				echo "Object: $sTargetClass - Id: $iObjectId not found <br/>\n";
+				echo Dict::Format('UI:Error:Object_Class_Id_NotFound', $this->m_sLinkedClass, $iObjectId);
 			}
 		}
 		//var_dump($aTable);
diff --git a/application/uiwizard.class.inc.php b/application/uiwizard.class.inc.php
index 7c65523bd..7285373b4 100644
--- a/application/uiwizard.class.inc.php
+++ b/application/uiwizard.class.inc.php
@@ -84,9 +84,9 @@ class UIWizard
 		$sDisabled = $bFinishEnabled ? '' : 'disabled';
 		$nbSteps = count($this->m_aWizardSteps['mandatory']) + count($this->m_aWizardSteps['optional']);
 		$this->m_oPage->add("<div style=\"text-align:center\">
-		<input type=\"button\" value=\"&lt;&lt; Back \" $sBackButtonDisabled onClick=\"GoToStep($iStepIndex, $iStepIndex - 1)\" />
-		<input type=\"button\" value=\" Next &gt;&gt;\" onClick=\"GoToStep($iStepIndex, 1+$iStepIndex)\" />
-		<input type=\"button\" value=\" Finish \" $sDisabled onClick=\"GoToStep($iStepIndex, 1+$nbSteps)\" />
+		<input type=\"button\" value=\"".Dict::S('UI:Button:Back')."\" $sBackButtonDisabled onClick=\"GoToStep($iStepIndex, $iStepIndex - 1)\" />
+		<input type=\"button\" value=\"".Dict::S('UI:Button:Next')."\" onClick=\"GoToStep($iStepIndex, 1+$iStepIndex)\" />
+		<input type=\"button\" value=\"".Dict::S('UI:Button:Finish')."\" $sDisabled onClick=\"GoToStep($iStepIndex, 1+$nbSteps)\" />
 		</div>\n");
 		$this->m_oPage->add("
 <script type=\"text/javascript\">
@@ -111,7 +111,7 @@ $sJSHandlerCode
 		$oAppContext = new ApplicationContext();
 		$this->m_oPage->add("<div class=\"wizContainer\" id=\"wizStep$iStepIndex\" style=\"display:none;\">\n");
 		$this->m_oPage->add("<a name=\"step$iStepIndex\" />\n");
-		$this->m_oPage->P("Final step: confirmation");
+		$this->m_oPage->P(Dict::S('UI:Wizard:FinalStepTitle'));
 		$this->m_oPage->add("<input type=\"hidden\" name=\"operation\" value=\"wizard_apply_new\" />\n");
 		$this->m_oPage->add("<input type=\"hidden\" name=\"transaction_id\" value=\"".utils::GetNewTransactionId()."\" />\n");
 		$this->m_oPage->add("<input type=\"hidden\" id=\"wizard_json_obj\" name=\"json_obj\" value=\"\" />\n");
@@ -284,7 +284,7 @@ $sJSHandlerCode
 			if (count($aCurrentStep) == 0)
 			{
 				// This step of the wizard would contain NO field !
-				$this->m_oPage->add("<strong>Error:</strong> Circular reference in the dependencies between the fields.");
+				$this->m_oPage->add(Dict::S('UI:Error:WizardCircularReferenceInDependencies'));
 				print_r($aFields);
 				break;
 			}
diff --git a/application/utils.inc.php b/application/utils.inc.php
index f5cb6021d..21833f5f5 100644
--- a/application/utils.inc.php
+++ b/application/utils.inc.php
@@ -62,27 +62,27 @@ class utils
 				
 				case UPLOAD_ERR_FORM_SIZE:
 				case UPLOAD_ERR_INI_SIZE:
-				throw new FileUploadException("Uploaded file is too big. (Max allowed size is ".ini_get('upload_max_filesize').". Check you PHP configuration for upload_max_filesize.");
+				throw new FileUploadException(Dict::Format('UI:Error:UploadedFileTooBig'), ini_get('upload_max_filesize'));
 				break;
 
 				case UPLOAD_ERR_PARTIAL:
-				throw new FileUploadException("File upload failed, file has been truncated.");
+				throw new FileUploadException(Dict::S('UI:Error:UploadedFileTruncated.'));
 				break;
 				
 				case UPLOAD_ERR_NO_TMP_DIR:
-				throw new FileUploadException("Missing a temporary folder.");
+				throw new FileUploadException(Dict::S('UI:Error:NoTmpDir'));
 				break;
 
 				case UPLOAD_ERR_CANT_WRITE:
-				throw new FileUploadException("Unable to write the temporary file to the disk (upload_tmp_dir = ".ini_get('upload_tmp_dir').")");
+				throw new FileUploadException(Dict::Format('UI:Error:CannotWriteToTmp_Dir', ini_get('upload_tmp_dir')));
 				break;
 
 				case UPLOAD_ERR_EXTENSION:
-				throw new FileUploadException("File upload stopped by extension. (Original file name: ".$_FILES[$sName]['name'].")");
+				throw new FileUploadException(Dict::Format('UI:Error:UploadStoppedByExtension_FileName', $_FILES[$sName]['name']));
 				break;
 				
 				default:
-				throw new FileUploadException("File upload failed, unknown cause (Error code = ".$_FILES[$sName]['error'].")");
+				throw new FileUploadException(Dict::Format('UI:Error:UploadFailedUnknownCause_Code', $_FILES[$sName]['error']));
 				break;
 
 			}
diff --git a/dictionaries/dictionary.itop.ui.php b/dictionaries/dictionary.itop.ui.php
index ee48ae9cd..a89039b10 100644
--- a/dictionaries/dictionary.itop.ui.php
+++ b/dictionaries/dictionary.itop.ui.php
@@ -313,15 +313,24 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:Button:GlobalSearch' => 'Search',
 	'UI:Button:Search' => ' Search ',
 	'UI:Button:Query' => ' Query ',
+	'UI:Button:Ok' => 'Ok',
 	'UI:Button:Cancel' => 'Cancel',
 	'UI:Button:Apply' => 'Apply',
 	'UI:Button:Back' => ' << Back ',
 	'UI:Button:Next' => ' Next >> ',
+	'UI:Button:Next' => ' Finish ',
 	'UI:Button:DoImport' => ' Run the Import ! ',
 	'UI:Button:Done' => ' Done ',
 	'UI:Button:SimulateImport' => ' Simulate the Import ',
 	'UI:Button:Test' => 'Test!',
 	'UI:Button:Evaluate' => ' Evaluate ',
+	'UI:Button:AddObject' => ' Add... ',
+	'UI:Button:BrowseObjects' => ' Browse... ',
+	'UI:Button:Add' => ' Add ',
+	'UI:Button:AddToList' => ' << Add ',
+	'UI:Button:RemoveFromList' => ' Remove >> ',
+	'UI:Button:FilterList' => ' Filter... ',
+
 	'UI:SearchToggle' => 'Search',
 	'UI:ClickToCreateNew' => 'Click here to create a new %1$s',
 	'UI:NoObjectToDisplay' => 'No object to display.',
@@ -330,6 +339,16 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:Error:MandatoryTemplateParameter_group_by' => 'Parameter group_by is mandatory. Check the definition of the display template.',
 	'UI:Error:InvalidGroupByFields' => 'Invalid list of fields to group by: "%1$s".',
 	'UI:Error:UnsupportedStyleOfBlock' => 'Error: unsupported style of block: "%1$s".',
+	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Incorrect link definition: the class of objects to manage: %1$s was not found as an external key in the class %2$s',
+	'UI:Error:Object_Class_Id_NotFound' => 'Object: %1$s:%2$d not found.',
+	'UI:Error:WizardCircularReferenceInDependencies' => 'Error: Circular reference in the dependencies between the fields, check the data model.',
+	'UI:Error:UploadedFileTooBig' => 'Uploaded file is too big. (Max allowed size is %1$s. Check you PHP configuration for upload_max_filesize.',
+	'UI:Error:UploadedFileTruncated.' => 'Uploaded file has been truncated !',
+	'UI:Error:NoTmpDir' => 'The temporary directory is not defined.',
+	'UI:Error:CannotWriteToTmp_Dir' => 'Unable to write the temporary file to the disk. upload_tmp_dir = "%1$s".',
+	'UI:Error:UploadStoppedByExtension_FileName' => 'Upload stopped  by extension. (Original file name = "%1$s").',
+	'UI:Error:UploadFailedUnknownCause_Code' => 'File upload failed, unknown cause. (Error code = "%1$s").',
+	
 	'UI:GroupBy:Count' => 'Count',
 	'UI:GroupBy:Count+' => 'Number of elements',
 	'UI:CountOfObjects' => '%1$d objects matching the criteria.',
@@ -471,6 +490,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:Schema:Label' => 'Label',
 	'UI:Schema:Label+' => 'Label of the attribute',
 	'UI:Schema:Type' => 'Type',
+	
 	'UI:Schema:Type+' => 'Data type of the attribute',
 	'UI:Schema:Origin' => 'Origin',
 	'UI:Schema:Origin+' => 'The base class in which this attribute is defined',
@@ -511,7 +531,21 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:Schema:LifeCycleAttributeMustChange' => 'Must change',
 	'UI:Schema:LifeCycleAttributeMustPrompt' => 'User will be prompted to change the value',
 	'UI:Schema:LifeCycleEmptyList' => 'empty list',
-
+	
+	'UI:LinksWidget:Autocomplete+' => 'Type the first 3 characters...',
+	'UI:Combo:SelectValue' => '--- select a value ---',
+	'UI:Label:SelectedObjects' => 'Selected objects: ',
+	'UI:Label:AvailableObjects' => 'Available objects: ',
+	'UI:Link_Class_Attributes' => '%1$s attributes',
+	'UI:SelectAllToggle+' => 'Select All / Deselect All',
+	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => 'Add %1$s objects linked with %2$s: %3$s',
+	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => 'Manage %1$s objects linked with %2$s: %3$s',
+	'UI:AddLinkedObjectsOf_Class' => 'Add %1$ss...',
+	'UI:RemoveLinkedObjectsOf_Class' => 'Remove selected objects',
+	'UI:Message:EmptyList:UseAdd' => 'The list is empty, use the "Add..." button to add elements.',
+	'UI:Message:EmptyList:UseSearchForm' => 'Use the search form above to search for objects to be added.',
+	
+	'UI:Wizard:FinalStepTitle' => 'Final step: confirmation'
 ));
 
 
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index bea05ca4d..ebeef3e73 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -308,6 +308,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Button:Search' => 'Rechercher',
 
 	'UI:Button:Query' => ' Lancer la requête ',
+	'UI:Button:Ok' => 'Ok',
 	'UI:Button:Cancel' => 'Annuler',
 	'UI:Button:Apply' => 'Appliquer',
 	'UI:Button:Back' => ' << Retour ',
@@ -317,6 +318,12 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Button:SimulateImport' => ' Simuler l\'import ',
 	'UI:Button:Test' => 'Tester !',
 	'UI:Button:Evaluate' => ' Exécuter ',
+	'UI:Button:AddObject' => ' Ajouter... ',
+	'UI:Button:BrowseObjects' => ' Naviguer... ',
+	'UI:Button:Add' => ' Ajouter ',
+	'UI:Button:AddToList' => ' << Ajouter ',
+	'UI:Button:RemoveFromList' => ' Enlever >> ',
+	'UI:Button:FilterList' => ' Filtrer... ',
 	
 	'UI:SearchToggle' => 'Recherche',
 
@@ -327,6 +334,16 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Error:MandatoryTemplateParameter_group_by' => 'Le paramètre group_by est obligatoire. Vérifiez la définition du modèle.',
 	'UI:Error:InvalidGroupByFields' => 'Liste des champs "group by" incorrecte: "%1$s".',
 	'UI:Error:UnsupportedStyleOfBlock' => 'Erreur: style de bloc("%1$s") inconnu.',
+	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'la définition du lien est incorrecte: la classe d\'objets à gérer: %1$s n\'est référencée par aucune clef externe de la classe %2$s',
+	'UI:Error:Object_Class_Id_NotFound' => 'L\'objet: %1$s:%2$d est introuvable.',
+	'UI:Error:WizardCircularReferenceInDependencies' => 'Erreur: Référence circulaire entre les dépendences entre champs, vérifiez le modèle de données.',
+	'UI:Error:UploadedFileTooBig' => 'Le fichier téléchargé est trop gros. (La taille maximale autorisée est %1$s). Vérifiez la valeur de la variable upload_max_filesize dans la configuration PHP.',
+	'UI:Error:UploadedFileTruncated.' => 'Le fichier téléchargé a été tronqué !',
+	'UI:Error:NoTmpDir' => 'Il n\'y a aucun répertoire temporaire de défini.',
+	'UI:Error:CannotWriteToTmp_Dir' => 'Impossible d\'écrire le fichier temporaire sur disque. upload_tmp_dir = "%1$s".',
+	'UI:Error:UploadStoppedByExtension_FileName' => 'Téléchargement arrêté à cause de l\'extension. (Nom du fichier original = "%1$s").',
+	'UI:Error:UploadFailedUnknownCause_Code' => 'Le téléchargement a échoué pour une raison inconnue. (Code d\'erreur = "%1$s").',
+	
 	'UI:GroupBy:Count' => 'Nombre',
 	'UI:GroupBy:Count+' => 'Nombre d\'éléments',
 	'UI:CountOfObjects' => '%1$d objets correspondants aux critères.',
@@ -512,6 +529,20 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Schema:LifeCycleAttributeMustPrompt' => 'L\'utilisateur se verra proposer de changer la valeur',
 	'UI:Schema:LifeCycleEmptyList' => 'liste vide',
 
+	'UI:LinksWidget:Autocomplete+' => 'Tapez les 3 premiers caractères...',
+	'UI:Combo:SelectValue' => '--- choisissez une valeur ---',
+	'UI:Label:SelectedObjects' => 'Objets sélectionnés: ',
+	'UI:Label:AvailableObjects' => 'Objets disponibles: ',
+	'UI:Link_Class_Attributes' => 'Attributs du type %1$s',
+	'UI:SelectAllToggle+' => 'Tout sélectionner / Tout déselectionner',
+	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => 'Ajouter des objets de type %1$s liés à %3$s (%2$s)',
+	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => 'Gérer les objets de type %1$s liés à %3$s (%2$s)',
+	'UI:AddLinkedObjectsOf_Class' => 'Ajouter des objets de type %1$s...',
+	'UI:RemoveLinkedObjectsOf_Class' => 'Enlever les objets sélectionnés',
+	'UI:Message:EmptyList:UseAdd' => 'La liste est vide, utilisez le bouton "Ajouter..." pour ajouter des objets.',
+	'UI:Message:EmptyList:UseSearchForm' => 'Utilisez le formulaire de recherche ci-dessus pour trouver les objets à ajouter.',
+
+	'UI:Wizard:FinalStepTitle' => 'Dernière étape: confirmation'
 ));
 
 ?>