Переглянути джерело

Query phrases: if the attribute 'fields' is left empty, then propose the legacy export URL and keep the user informed about the limitations

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3695 a333f486-631f-4898-b8df-5754b55c2be0
romainq 9 роки тому
батько
коміт
87017d130a

+ 14 - 3
application/query.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
+// Copyright (C) 2010-2015 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -22,7 +22,7 @@
  * Application internal events
  * There is also a file log 
  *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @copyright   Copyright (C) 2010-2015 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -92,7 +92,18 @@ class QueryOQL extends Query
 		
 		if (!$bEditMode)
 		{
-			$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export-v2.php?format=spreadsheet&login_mode=basic&query='.$this->GetKey();
+			$sFields = trim($this->Get('fields'));
+			$bExportV1Recommended = ($sFields == '');
+			if ($bExportV1Recommended)
+			{
+				$oFieldAttDef = MetaModel::GetAttributeDef('QueryOQL', 'fields');
+				$oPage->add('<div class="message message_error" style="padding-left: 30px;"><div style="padding: 10px;">'.Dict::Format('UI:Query:UrlV1', $oFieldAttDef->GetLabel()).'</div></div>');
+				$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?format=spreadsheet&login_mode=basic&query='.$this->GetKey();
+			}
+			else 
+			{
+				$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export-v2.php?format=spreadsheet&login_mode=basic&query='.$this->GetKey();
+			}
 			$sOql = $this->Get('oql');
 			$sMessage = null;
 			try

Різницю між файлами не показано, бо вона завелика
+ 699 - 698
dictionaries/da.dictionary.itop.ui.php


+ 1 - 0
dictionaries/de.dictionary.itop.ui.php

@@ -495,6 +495,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'UI:RunQuery:SerializedFilter' => 'Serieller Filter: ',
 	'UI:RunQuery:Error' => 'Ein Fehler trat während der Abfrage auf: %1$s auf.',
 	'UI:Query:UrlForExcel' => 'URL für MS Excel Web Queries',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
 	'UI:Schema:Title' => 'iTop Objekte-Schema',
 	'UI:Schema:CategoryMenuItem' => 'Kategorie <b>%1$s</b>',
 	'UI:Schema:Relationships' => 'Wechselseite Beziehungen',

+ 1 - 0
dictionaries/dictionary.itop.ui.php

@@ -653,6 +653,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:RunQuery:SerializedFilter' => 'Serialized filter: ',
 	'UI:RunQuery:Error' => 'An error occured while running the query: %1$s',
 	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested here below points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. <br/>Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.',
 	'UI:Schema:Title' => 'iTop objects schema',
 	'UI:Schema:CategoryMenuItem' => 'Category <b>%1$s</b>',
 	'UI:Schema:Relationships' => 'Relationships',

+ 1 - 0
dictionaries/es_cr.dictionary.itop.ui.php

@@ -648,6 +648,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'UI:RunQuery:SerializedFilter' => 'Filtro de serialización: ',
 	'UI:RunQuery:Error' => 'Ha ocurrido un error al ejecutar la consulta: %1$s',	
 	'UI:Query:UrlForExcel' => 'URL para usarse en consultas web de MS-Excel',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
 	'UI:Schema:Title' => 'Esquema de Objetos en iTop',
 	'UI:Schema:CategoryMenuItem' => 'Categoria <b>%1$s</b>',
 	'UI:Schema:Relationships' => 'Relaciones',

+ 1 - 0
dictionaries/fr.dictionary.itop.ui.php

@@ -525,6 +525,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:RunQuery:SerializedFilter' => 'Version sérialisée : ',
 	'UI:RunQuery:Error' => 'Une erreur s\'est produite durant l\'exécution de la requête : %1$s',
 	'UI:Query:UrlForExcel' => 'Lien à copier-coller dans Excel, pour déclarer une source de données à partir du web',
+	'UI:Query:UrlV1' => 'La liste des champs à exporter n\'a pas été spécifiée. La page <em>export-V2.php</em> ne peut pas fonctionner sans cette information. Par conséquent, le lien fourni ci-dessous pointe sur l\'ancienne page: <em>export.php</em>. Cette ancienne version de l\'export présente la limitation suivante : la liste des champs exportés varie en fonction du format de l\'export et du modèle de données. <br/>Si vous devez garantir la stabilité du format de l\'export (liste des colonnes) sur le long terme, alors vous devrez renseigner l\'attribut "Champs" et utiliser la page <em>export-V2.php</em>.',
 	'UI:Schema:Title' => 'Modèle de données iTop',
 	'UI:Schema:CategoryMenuItem' => 'Catégorie <b>%1$s</b>',
 	'UI:Schema:Relationships' => 'Relations',

+ 1 - 0
dictionaries/hu.dictionary.itop.ui.php

@@ -857,6 +857,7 @@ Akció kiváltó okhoz rendelésekor kap egy sorszámot , amely meghatározza az
 	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in the Rule %1$s: %2$s.~~',
 	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in the Category %1$s: %2$s.~~',
 	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries~~',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
 	'UI:Edit:TestQuery' => 'Test query~~',
 	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
 	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',

+ 319 - 318
dictionaries/it.dictionary.itop.ui.php

@@ -902,323 +902,324 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'UI:BulkAction:NoObjectSelected' => 'Si prega di selezionare almeno un oggetto per eseguire questa operazione',
 	'UI:AttemptingToChangeASlaveAttribute_Name' => 'Il campo %1$s on è scrivibile, perché è comandato dalla sincronizzazione dei dati. Valore rimane invariato.',
 	'UI:Button:Refresh' => 'Ricarica',
-	'Class:UserInternal' => 'User Internal~~',
-	'Class:UserInternal+' => 'User defined within iTop~~',
-	'Class:URP_StimulusGrant/Attribute:profile' => 'Profile~~',
-	'Class:URP_StimulusGrant/Attribute:profile+' => 'usage profile~~',
-	'UI:Button:Save' => 'Save~~',
-	'UI:Button:Rename' => ' Rename... ~~',
-	'UI:SplitDateTime-Date' => 'date~~',
-	'UI:SplitDateTime-Time' => 'time~~',
-	'UI:SearchValue:NbSelected' => '# selected~~',
-	'UI:SearchValue:CheckAll' => 'Check All~~',
-	'UI:SearchValue:UncheckAll' => 'Uncheck All~~',
-	'UI:Login:ForgotPwd' => 'Forgot your password?~~',
-	'UI:Login:ForgotPwdForm' => 'Forgot your password~~',
-	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.~~',
-	'UI:Login:ResetPassword' => 'Send now!~~',
-	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
-	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
-	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
-	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
-	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
-	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
-	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...~~',
-	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
-	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href=\"%1$s\">enter a new password</a></p>.~~',
-	'UI:ResetPwd-Title' => 'Reset password~~',
-	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
-	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
-	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
-	'UI:ResetPwd-Login' => 'Click here to login...~~',
-	'UI:Login:PasswordChanged' => 'Password successfully set!~~',
-	'UI:ApplicationEnvironment' => 'Application environment: %1$s~~',
-	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
-	'UI:CSVReport-Value-Modified' => 'Modified~~',
-	'UI:CSVReport-Value-SetIssue' => 'Could not be changed - reason: %1$s~~',
-	'UI:CSVReport-Value-ChangeIssue' => 'Could not be changed to %1$s - reason: %2$s~~',
-	'UI:CSVReport-Value-NoMatch' => 'No match~~',
-	'UI:CSVReport-Value-Missing' => 'Missing mandatory value~~',
-	'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects~~',
-	'UI:CSVReport-Row-Unchanged' => 'unchanged~~',
-	'UI:CSVReport-Row-Created' => 'created~~',
-	'UI:CSVReport-Row-Updated' => 'updated %1$d cols~~',
-	'UI:CSVReport-Row-Disappeared' => 'disappeared, changed %1$d cols~~',
-	'UI:CSVReport-Row-Issue' => 'Issue: %1$s~~',
-	'UI:CSVReport-Value-Issue-Null' => 'Null not allowed~~',
-	'UI:CSVReport-Value-Issue-NotFound' => 'Object not found~~',
-	'UI:CSVReport-Value-Issue-FoundMany' => 'Found %1$d matches~~',
-	'UI:CSVReport-Value-Issue-Readonly' => 'The attribute \'%1$s\' is read-only and cannot be modified (current value: %2$s, proposed value: %3$s)~~',
-	'UI:CSVReport-Value-Issue-Format' => 'Failed to process input: %1$s~~',
-	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling~~',
-	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s~~',
-	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributes not consistent with each others: %1$s~~',
-	'UI:CSVReport-Row-Issue-Attribute' => 'Unexpected attribute value(s)~~',
-	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Could not be created, due to missing external key(s): %1$s~~',
-	'UI:CSVReport-Row-Issue-DateFormat' => 'wrong date format~~',
-	'UI:CSVReport-Row-Issue-Reconciliation' => 'failed to reconcile~~',
-	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation~~',
-	'UI:CSVReport-Row-Issue-Internal' => 'Internal error: %1$s, %2$s~~',
-	'UI:CSVReport-Icon-Unchanged' => 'Unchanged~~',
-	'UI:CSVReport-Icon-Modified' => 'Modified~~',
-	'UI:CSVReport-Icon-Missing' => 'Missing~~',
-	'UI:CSVReport-Object-MissingToUpdate' => 'Missing object: will be updated~~',
-	'UI:CSVReport-Object-MissingUpdated' => 'Missing object: updated~~',
-	'UI:CSVReport-Icon-Created' => 'Created~~',
-	'UI:CSVReport-Object-ToCreate' => 'Object will be created~~',
-	'UI:CSVReport-Object-Created' => 'Object created~~',
-	'UI:CSVReport-Icon-Error' => 'Error~~',
-	'UI:CSVReport-Object-Error' => 'ERROR: %1$s~~',
-	'UI:CSVReport-Object-Ambiguous' => 'AMBIGUOUS: %1$s~~',
-	'UI:CSVReport-Stats-Errors' => '%1$.0f %% of the loaded objects have errors and will be ignored.~~',
-	'UI:CSVReport-Stats-Created' => '%1$.0f %% of the loaded objects will be created.~~',
-	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of the loaded objects will be modified.~~',
-	'UI:CSVExport:AdvancedMode' => 'Advanced mode~~',
-	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.~~',
-	'UI:CSVExport:LostChars' => 'Encoding issue~~',
-	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').~~',
-	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in the Rule %1$s: %2$s.~~',
-	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in the Category %1$s: %2$s.~~',
-	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries~~',
-	'UI:Edit:TestQuery' => 'Test query~~',
-	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
-	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
-	'UI:Search:Enlarge' => 'Broaden the search~~',
-	'Menu:QueryMenu' => 'Query phrasebook~~',
-	'Menu:QueryMenu+' => 'Query phrasebook~~',
-	'UI:Download-CSV' => 'Download %1$s~~',
-	'UI:RelationGroups' => 'Groups~~',
-	'UI:ElementsDisplayed' => 'Filtering~~',
-	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
-	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
-	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
-	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
-	'UI:Relation:NoneSelected' => 'None~~',
-	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
-	'UI:Relation:DrillDown' => 'Details...~~',
-	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
-	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
-	'UI:RelationOption:Untitled' => 'Untitled~~',
-	'UI:Relation:Key' => 'Key~~',
-	'UI:Relation:Comments' => 'Comments~~',
-	'UI:RelationOption:Title' => 'Title~~',
-	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
-	'UI:RelationOption:Comments' => 'Comments~~',
-	'UI:Button:Export' => 'Export~~',
-	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
-	'UI:PageFormat_A3' => 'A3~~',
-	'UI:PageFormat_A4' => 'A4~~',
-	'UI:PageFormat_Letter' => 'Letter~~',
-	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
-	'UI:PageOrientation_Portrait' => 'Portrait~~',
-	'UI:PageOrientation_Landscape' => 'Landscape~~',
-	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
-	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
-	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
-	'Portal:NoRequestMgmt' => 'Dear %1$s, you have been redirected to this page because your account is configured with the profile \'Portal user\'. Unfortunately, iTop has not been installed with the feature \'Request Management\'. Please contact your administrator.~~',
-	'Portal:TitleDetailsFor_Request' => 'Details for request~~',
-	'Portal:SelectRequestTemplate' => 'Select a template for %1$s~~',
-	'UI:Pagination:HeaderSelection' => 'Total: %1$s objects (%2$s objects selected).~~',
-	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objects.~~',
-	'UI:Pagination:PageSize' => '%1$s objects per page~~',
-	'UI:Pagination:PagesLabel' => 'Pages:~~',
-	'UI:Pagination:All' => 'All~~',
-	'UI:HierarchyOf_Class' => 'Hierarchy of %1$s~~',
-	'UI:Preferences' => 'Preferences...~~',
-	'UI:FavoriteOrganizations' => 'Favorite Organizations~~',
-	'UI:FavoriteOrganizations+' => 'Check in the list below the organizations that you want to see in the drop-down menu for a quick access. Note that this is not a security setting, objects from any organization are still visible and can be accessed by selecting \"All Organizations\" in the drop-down list.~~',
-	'UI:FavoriteLanguage' => 'Language of the User Interface~~',
-	'UI:Favorites:SelectYourLanguage' => 'Select your preferred language~~',
-	'UI:FavoriteOtherSettings' => 'Other Settings~~',
-	'UI:Favorites:Default_X_ItemsPerPage' => 'Default length for lists:  %1$s items per page~~',
-	'UI:NavigateAwayConfirmationMessage' => 'Any modification will be discarded.~~',
-	'UI:CancelConfirmationMessage' => 'You will loose your changes. Continue anyway?~~',
-	'UI:AutoApplyConfirmationMessage' => 'Some changes have not been applied yet. Do you want itop to take them into account?~~',
-	'UI:Create_Class_InState' => 'Create the %1$s in state: ~~',
-	'UI:OrderByHint_Values' => 'Sort order: %1$s~~',
-	'UI:Menu:AddToDashboard' => 'Add To Dashboard...~~',
-	'UI:ConfigureThisList' => 'Configure This List...~~',
-	'UI:ListConfigurationTitle' => 'List Configuration~~',
-	'UI:ColumnsAndSortOrder' => 'Columns and sort order:~~',
-	'UI:UseDefaultSettings' => 'Use the Default Settings~~',
-	'UI:UseSpecificSettings' => 'Use the Following Settings:~~',
-	'UI:Display_X_ItemsPerPage' => 'Display %1$s items per page~~',
-	'UI:UseSavetheSettings' => 'Save the Settings~~',
-	'UI:OnlyForThisList' => 'Only for this list~~',
-	'UI:ForAllLists' => 'Default for all lists~~',
-	'UI:ExtKey_AsLink' => '%1$s (Link)~~',
-	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)~~',
-	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)~~',
-	'UI:Button:MoveUp' => 'Move Up~~',
-	'UI:Button:MoveDown' => 'Move Down~~',
-	'UI:OQL:UnknownClassAndFix' => 'Unknown class \"%1$s\". You may try \"%2$s\" instead.~~',
-	'UI:OQL:UnknownClassNoFix' => 'Unknown class \"%1$s\"~~',
-	'UI:Dashboard:Edit' => 'Edit This Page...~~',
-	'UI:Dashboard:Revert' => 'Revert To Original Version...~~',
-	'UI:Dashboard:RevertConfirm' => 'Every changes made to the original version will be lost. Please confirm that you want to do this.~~',
-	'UI:ExportDashBoard' => 'Export to a file~~',
-	'UI:ImportDashBoard' => 'Import from a file...~~',
-	'UI:ImportDashboardTitle' => 'Import From a File~~',
-	'UI:ImportDashboardText' => 'Select a dashboard file to import:~~',
-	'UI:DashletCreation:Title' => 'Create a new Dashlet~~',
-	'UI:DashletCreation:Dashboard' => 'Dashboard~~',
-	'UI:DashletCreation:DashletType' => 'Dashlet Type~~',
-	'UI:DashletCreation:EditNow' => 'Edit the Dashboard~~',
-	'UI:DashboardEdit:Title' => 'Dashboard Editor~~',
-	'UI:DashboardEdit:DashboardTitle' => 'Title~~',
-	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
-	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~',
-	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
-	'UI:DashboardEdit:Layout' => 'Layout~~',
-	'UI:DashboardEdit:Properties' => 'Dashboard Properties~~',
-	'UI:DashboardEdit:Dashlets' => 'Available Dashlets~~',
-	'UI:DashboardEdit:DashletProperties' => 'Dashlet Properties~~',
-	'UI:Form:Property' => 'Property~~',
-	'UI:Form:Value' => 'Value~~',
-	'UI:DashletPlainText:Label' => 'Text~~',
-	'UI:DashletPlainText:Description' => 'Plain text (no formatting)~~',
-	'UI:DashletPlainText:Prop-Text' => 'Text~~',
-	'UI:DashletPlainText:Prop-Text:Default' => 'Please enter some text here...~~',
-	'UI:DashletObjectList:Label' => 'Object list~~',
-	'UI:DashletObjectList:Description' => 'Object list dashlet~~',
-	'UI:DashletObjectList:Prop-Title' => 'Title~~',
-	'UI:DashletObjectList:Prop-Query' => 'Query~~',
-	'UI:DashletObjectList:Prop-Menu' => 'Menu~~',
-	'UI:DashletGroupBy:Prop-Title' => 'Title~~',
-	'UI:DashletGroupBy:Prop-Query' => 'Query~~',
-	'UI:DashletGroupBy:Prop-Style' => 'Style~~',
-	'UI:DashletGroupBy:Prop-GroupBy' => 'Group by...~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Hour of %1$s (0-23)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Month of %1$s (1 - 12)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Day of week for %1$s~~',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Day of month for %1$s~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (hour)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (month)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (day of week)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (day of month)~~',
-	'UI:DashletGroupBy:MissingGroupBy' => 'Please select the field on which the objects will be grouped together~~',
-	'UI:DashletGroupByPie:Label' => 'Pie Chart~~',
-	'UI:DashletGroupByPie:Description' => 'Pie Chart~~',
-	'UI:DashletGroupByBars:Label' => 'Bar Chart~~',
-	'UI:DashletGroupByBars:Description' => 'Bar Chart~~',
-	'UI:DashletGroupByTable:Label' => 'Group By (table)~~',
-	'UI:DashletGroupByTable:Description' => 'List (Grouped by a field)~~',
-	'UI:DashletHeaderStatic:Label' => 'Header~~',
-	'UI:DashletHeaderStatic:Description' => 'Displays an horizontal separator~~',
-	'UI:DashletHeaderStatic:Prop-Title' => 'Title~~',
-	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacts~~',
-	'UI:DashletHeaderStatic:Prop-Icon' => 'Icon~~',
-	'UI:DashletHeaderDynamic:Label' => 'Header with statistics~~',
-	'UI:DashletHeaderDynamic:Description' => 'Header with stats (grouped by...)~~',
-	'UI:DashletHeaderDynamic:Prop-Title' => 'Title~~',
-	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contacts~~',
-	'UI:DashletHeaderDynamic:Prop-Icon' => 'Icon~~',
-	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Subtitle~~',
-	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contacts~~',
-	'UI:DashletHeaderDynamic:Prop-Query' => 'Query~~',
-	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Group by~~',
-	'UI:DashletHeaderDynamic:Prop-Values' => 'Values~~',
-	'UI:DashletBadge:Label' => 'Badge~~',
-	'UI:DashletBadge:Description' => 'Object Icon with new/search~~',
-	'UI:DashletBadge:Prop-Class' => 'Class~~',
-	'DayOfWeek-Sunday' => 'Sunday~~',
-	'DayOfWeek-Monday' => 'Monday~~',
-	'DayOfWeek-Tuesday' => 'Tuesday~~',
-	'DayOfWeek-Wednesday' => 'Wednesday~~',
-	'DayOfWeek-Thursday' => 'Thursday~~',
-	'DayOfWeek-Friday' => 'Friday~~',
-	'DayOfWeek-Saturday' => 'Saturday~~',
-	'Month-01' => 'January~~',
-	'Month-02' => 'February~~',
-	'Month-03' => 'March~~',
-	'Month-04' => 'April~~',
-	'Month-05' => 'May~~',
-	'Month-06' => 'June~~',
-	'Month-07' => 'July~~',
-	'Month-08' => 'August~~',
-	'Month-09' => 'September~~',
-	'Month-10' => 'October~~',
-	'Month-11' => 'November~~',
-	'Month-12' => 'December~~',
-	'DayOfWeek-Sunday-Min' => 'Su~~',
-	'DayOfWeek-Monday-Min' => 'Mo~~',
-	'DayOfWeek-Tuesday-Min' => 'Tu~~',
-	'DayOfWeek-Wednesday-Min' => 'We~~',
-	'DayOfWeek-Thursday-Min' => 'Th~~',
-	'DayOfWeek-Friday-Min' => 'Fr~~',
-	'DayOfWeek-Saturday-Min' => 'Sa~~',
-	'Month-01-Short' => 'Jan~~',
-	'Month-02-Short' => 'Feb~~',
-	'Month-03-Short' => 'Mar~~',
-	'Month-04-Short' => 'Apr~~',
-	'Month-05-Short' => 'May~~',
-	'Month-06-Short' => 'Jun~~',
-	'Month-07-Short' => 'Jul~~',
-	'Month-08-Short' => 'Aug~~',
-	'Month-09-Short' => 'Sep~~',
-	'Month-10-Short' => 'Oct~~',
-	'Month-11-Short' => 'Nov~~',
-	'Month-12-Short' => 'Dec~~',
-	'Calendar-FirstDayOfWeek' => '0~~',
-	'UI:Menu:ShortcutList' => 'Create a Shortcut...~~',
-	'UI:ShortcutRenameDlg:Title' => 'Rename the shortcut~~',
-	'UI:ShortcutListDlg:Title' => 'Create a shortcut for the list~~',
-	'UI:ShortcutDelete:Confirm' => 'Please confirm that wou wish to delete the shortcut(s).~~',
-	'Menu:MyShortcuts' => 'My Shortcuts~~',
-	'Class:Shortcut' => 'Shortcut~~',
-	'Class:Shortcut/Attribute:name' => 'Name~~',
-	'Class:Shortcut/Attribute:name+' => 'Label used in the menu and page title~~',
-	'Class:ShortcutOQL' => 'Search result shortcut~~',
-	'Class:ShortcutOQL/Attribute:oql' => 'Query~~',
-	'Class:ShortcutOQL/Attribute:oql+' => 'OQL defining the list of objects to search for~~',
-	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh~~',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled~~',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
-	'UI:FillAllMandatoryFields' => 'Please fill all mandatory fields.~~',
-	'UI:ValueMustBeSet' => 'Please specify a value~~',
-	'UI:ValueMustBeChanged' => 'Please change the value~~',
-	'UI:ValueInvalidFormat' => 'Invalid format~~',
-	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
-	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
-	'UI:CSVImportError_items' => 'Errors: %1$d~~',
-	'UI:CSVImportCreated_items' => 'Created: %1$d~~',
-	'UI:CSVImportModified_items' => 'Modified: %1$d~~',
-	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d~~',
-	'UI:Button:Remove' => 'Remove~~',
-	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
-	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
-	'UI:AboutBox' => 'About iTop...~~',
-	'UI:About:Title' => 'About iTop~~',
-	'UI:About:DataModel' => 'Data model~~',
-	'UI:About:Support' => 'Support information~~',
-	'UI:About:Licenses' => 'Licenses~~',
-	'UI:About:Modules' => 'Installed modules~~',
-	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
-	'UI:DisconnectedDlgTitle' => 'Warning!~~',
-	'UI:LoginAgain' => 'Login again~~',
-	'UI:StayOnThePage' => 'Stay on this page~~',
-	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
-	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
-	'ExcelExporter:ExportButton' => 'Export~~',
-	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
-	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
-	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
-	'ExcelExporter:Done' => 'Done.~~',
-	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
-	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
-	'ExcelExport:Statistics' => 'Statistics~~',
-	'portal:legacy_portal' => 'End-User Portal~~',
-	'portal:backoffice' => 'iTop Back-Office User Interface~~',
-	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
-	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
-	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
-	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
-	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
-	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
-	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
+	'Class:UserInternal' => 'User Internal~~',
+	'Class:UserInternal+' => 'User defined within iTop~~',
+	'Class:URP_StimulusGrant/Attribute:profile' => 'Profile~~',
+	'Class:URP_StimulusGrant/Attribute:profile+' => 'usage profile~~',
+	'UI:Button:Save' => 'Save~~',
+	'UI:Button:Rename' => ' Rename... ~~',
+	'UI:SplitDateTime-Date' => 'date~~',
+	'UI:SplitDateTime-Time' => 'time~~',
+	'UI:SearchValue:NbSelected' => '# selected~~',
+	'UI:SearchValue:CheckAll' => 'Check All~~',
+	'UI:SearchValue:UncheckAll' => 'Uncheck All~~',
+	'UI:Login:ForgotPwd' => 'Forgot your password?~~',
+	'UI:Login:ForgotPwdForm' => 'Forgot your password~~',
+	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.~~',
+	'UI:Login:ResetPassword' => 'Send now!~~',
+	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
+	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
+	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
+	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
+	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
+	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
+	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
+	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
+	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...~~',
+	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
+	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href=\"%1$s\">enter a new password</a></p>.~~',
+	'UI:ResetPwd-Title' => 'Reset password~~',
+	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
+	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
+	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
+	'UI:ResetPwd-Login' => 'Click here to login...~~',
+	'UI:Login:PasswordChanged' => 'Password successfully set!~~',
+	'UI:ApplicationEnvironment' => 'Application environment: %1$s~~',
+	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
+	'UI:CSVReport-Value-Modified' => 'Modified~~',
+	'UI:CSVReport-Value-SetIssue' => 'Could not be changed - reason: %1$s~~',
+	'UI:CSVReport-Value-ChangeIssue' => 'Could not be changed to %1$s - reason: %2$s~~',
+	'UI:CSVReport-Value-NoMatch' => 'No match~~',
+	'UI:CSVReport-Value-Missing' => 'Missing mandatory value~~',
+	'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects~~',
+	'UI:CSVReport-Row-Unchanged' => 'unchanged~~',
+	'UI:CSVReport-Row-Created' => 'created~~',
+	'UI:CSVReport-Row-Updated' => 'updated %1$d cols~~',
+	'UI:CSVReport-Row-Disappeared' => 'disappeared, changed %1$d cols~~',
+	'UI:CSVReport-Row-Issue' => 'Issue: %1$s~~',
+	'UI:CSVReport-Value-Issue-Null' => 'Null not allowed~~',
+	'UI:CSVReport-Value-Issue-NotFound' => 'Object not found~~',
+	'UI:CSVReport-Value-Issue-FoundMany' => 'Found %1$d matches~~',
+	'UI:CSVReport-Value-Issue-Readonly' => 'The attribute \'%1$s\' is read-only and cannot be modified (current value: %2$s, proposed value: %3$s)~~',
+	'UI:CSVReport-Value-Issue-Format' => 'Failed to process input: %1$s~~',
+	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling~~',
+	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s~~',
+	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributes not consistent with each others: %1$s~~',
+	'UI:CSVReport-Row-Issue-Attribute' => 'Unexpected attribute value(s)~~',
+	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Could not be created, due to missing external key(s): %1$s~~',
+	'UI:CSVReport-Row-Issue-DateFormat' => 'wrong date format~~',
+	'UI:CSVReport-Row-Issue-Reconciliation' => 'failed to reconcile~~',
+	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation~~',
+	'UI:CSVReport-Row-Issue-Internal' => 'Internal error: %1$s, %2$s~~',
+	'UI:CSVReport-Icon-Unchanged' => 'Unchanged~~',
+	'UI:CSVReport-Icon-Modified' => 'Modified~~',
+	'UI:CSVReport-Icon-Missing' => 'Missing~~',
+	'UI:CSVReport-Object-MissingToUpdate' => 'Missing object: will be updated~~',
+	'UI:CSVReport-Object-MissingUpdated' => 'Missing object: updated~~',
+	'UI:CSVReport-Icon-Created' => 'Created~~',
+	'UI:CSVReport-Object-ToCreate' => 'Object will be created~~',
+	'UI:CSVReport-Object-Created' => 'Object created~~',
+	'UI:CSVReport-Icon-Error' => 'Error~~',
+	'UI:CSVReport-Object-Error' => 'ERROR: %1$s~~',
+	'UI:CSVReport-Object-Ambiguous' => 'AMBIGUOUS: %1$s~~',
+	'UI:CSVReport-Stats-Errors' => '%1$.0f %% of the loaded objects have errors and will be ignored.~~',
+	'UI:CSVReport-Stats-Created' => '%1$.0f %% of the loaded objects will be created.~~',
+	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of the loaded objects will be modified.~~',
+	'UI:CSVExport:AdvancedMode' => 'Advanced mode~~',
+	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.~~',
+	'UI:CSVExport:LostChars' => 'Encoding issue~~',
+	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').~~',
+	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in the Rule %1$s: %2$s.~~',
+	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in the Category %1$s: %2$s.~~',
+	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries~~',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
+	'UI:Edit:TestQuery' => 'Test query~~',
+	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
+	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
+	'UI:Search:Enlarge' => 'Broaden the search~~',
+	'Menu:QueryMenu' => 'Query phrasebook~~',
+	'Menu:QueryMenu+' => 'Query phrasebook~~',
+	'UI:Download-CSV' => 'Download %1$s~~',
+	'UI:RelationGroups' => 'Groups~~',
+	'UI:ElementsDisplayed' => 'Filtering~~',
+	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
+	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
+	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
+	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
+	'UI:Relation:NoneSelected' => 'None~~',
+	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
+	'UI:Relation:DrillDown' => 'Details...~~',
+	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
+	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
+	'UI:RelationOption:Untitled' => 'Untitled~~',
+	'UI:Relation:Key' => 'Key~~',
+	'UI:Relation:Comments' => 'Comments~~',
+	'UI:RelationOption:Title' => 'Title~~',
+	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
+	'UI:RelationOption:Comments' => 'Comments~~',
+	'UI:Button:Export' => 'Export~~',
+	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
+	'UI:PageFormat_A3' => 'A3~~',
+	'UI:PageFormat_A4' => 'A4~~',
+	'UI:PageFormat_Letter' => 'Letter~~',
+	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
+	'UI:PageOrientation_Portrait' => 'Portrait~~',
+	'UI:PageOrientation_Landscape' => 'Landscape~~',
+	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
+	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
+	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
+	'Portal:NoRequestMgmt' => 'Dear %1$s, you have been redirected to this page because your account is configured with the profile \'Portal user\'. Unfortunately, iTop has not been installed with the feature \'Request Management\'. Please contact your administrator.~~',
+	'Portal:TitleDetailsFor_Request' => 'Details for request~~',
+	'Portal:SelectRequestTemplate' => 'Select a template for %1$s~~',
+	'UI:Pagination:HeaderSelection' => 'Total: %1$s objects (%2$s objects selected).~~',
+	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objects.~~',
+	'UI:Pagination:PageSize' => '%1$s objects per page~~',
+	'UI:Pagination:PagesLabel' => 'Pages:~~',
+	'UI:Pagination:All' => 'All~~',
+	'UI:HierarchyOf_Class' => 'Hierarchy of %1$s~~',
+	'UI:Preferences' => 'Preferences...~~',
+	'UI:FavoriteOrganizations' => 'Favorite Organizations~~',
+	'UI:FavoriteOrganizations+' => 'Check in the list below the organizations that you want to see in the drop-down menu for a quick access. Note that this is not a security setting, objects from any organization are still visible and can be accessed by selecting \"All Organizations\" in the drop-down list.~~',
+	'UI:FavoriteLanguage' => 'Language of the User Interface~~',
+	'UI:Favorites:SelectYourLanguage' => 'Select your preferred language~~',
+	'UI:FavoriteOtherSettings' => 'Other Settings~~',
+	'UI:Favorites:Default_X_ItemsPerPage' => 'Default length for lists:  %1$s items per page~~',
+	'UI:NavigateAwayConfirmationMessage' => 'Any modification will be discarded.~~',
+	'UI:CancelConfirmationMessage' => 'You will loose your changes. Continue anyway?~~',
+	'UI:AutoApplyConfirmationMessage' => 'Some changes have not been applied yet. Do you want itop to take them into account?~~',
+	'UI:Create_Class_InState' => 'Create the %1$s in state: ~~',
+	'UI:OrderByHint_Values' => 'Sort order: %1$s~~',
+	'UI:Menu:AddToDashboard' => 'Add To Dashboard...~~',
+	'UI:ConfigureThisList' => 'Configure This List...~~',
+	'UI:ListConfigurationTitle' => 'List Configuration~~',
+	'UI:ColumnsAndSortOrder' => 'Columns and sort order:~~',
+	'UI:UseDefaultSettings' => 'Use the Default Settings~~',
+	'UI:UseSpecificSettings' => 'Use the Following Settings:~~',
+	'UI:Display_X_ItemsPerPage' => 'Display %1$s items per page~~',
+	'UI:UseSavetheSettings' => 'Save the Settings~~',
+	'UI:OnlyForThisList' => 'Only for this list~~',
+	'UI:ForAllLists' => 'Default for all lists~~',
+	'UI:ExtKey_AsLink' => '%1$s (Link)~~',
+	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)~~',
+	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)~~',
+	'UI:Button:MoveUp' => 'Move Up~~',
+	'UI:Button:MoveDown' => 'Move Down~~',
+	'UI:OQL:UnknownClassAndFix' => 'Unknown class \"%1$s\". You may try \"%2$s\" instead.~~',
+	'UI:OQL:UnknownClassNoFix' => 'Unknown class \"%1$s\"~~',
+	'UI:Dashboard:Edit' => 'Edit This Page...~~',
+	'UI:Dashboard:Revert' => 'Revert To Original Version...~~',
+	'UI:Dashboard:RevertConfirm' => 'Every changes made to the original version will be lost. Please confirm that you want to do this.~~',
+	'UI:ExportDashBoard' => 'Export to a file~~',
+	'UI:ImportDashBoard' => 'Import from a file...~~',
+	'UI:ImportDashboardTitle' => 'Import From a File~~',
+	'UI:ImportDashboardText' => 'Select a dashboard file to import:~~',
+	'UI:DashletCreation:Title' => 'Create a new Dashlet~~',
+	'UI:DashletCreation:Dashboard' => 'Dashboard~~',
+	'UI:DashletCreation:DashletType' => 'Dashlet Type~~',
+	'UI:DashletCreation:EditNow' => 'Edit the Dashboard~~',
+	'UI:DashboardEdit:Title' => 'Dashboard Editor~~',
+	'UI:DashboardEdit:DashboardTitle' => 'Title~~',
+	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
+	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~',
+	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
+	'UI:DashboardEdit:Layout' => 'Layout~~',
+	'UI:DashboardEdit:Properties' => 'Dashboard Properties~~',
+	'UI:DashboardEdit:Dashlets' => 'Available Dashlets~~',
+	'UI:DashboardEdit:DashletProperties' => 'Dashlet Properties~~',
+	'UI:Form:Property' => 'Property~~',
+	'UI:Form:Value' => 'Value~~',
+	'UI:DashletPlainText:Label' => 'Text~~',
+	'UI:DashletPlainText:Description' => 'Plain text (no formatting)~~',
+	'UI:DashletPlainText:Prop-Text' => 'Text~~',
+	'UI:DashletPlainText:Prop-Text:Default' => 'Please enter some text here...~~',
+	'UI:DashletObjectList:Label' => 'Object list~~',
+	'UI:DashletObjectList:Description' => 'Object list dashlet~~',
+	'UI:DashletObjectList:Prop-Title' => 'Title~~',
+	'UI:DashletObjectList:Prop-Query' => 'Query~~',
+	'UI:DashletObjectList:Prop-Menu' => 'Menu~~',
+	'UI:DashletGroupBy:Prop-Title' => 'Title~~',
+	'UI:DashletGroupBy:Prop-Query' => 'Query~~',
+	'UI:DashletGroupBy:Prop-Style' => 'Style~~',
+	'UI:DashletGroupBy:Prop-GroupBy' => 'Group by...~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Hour of %1$s (0-23)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Month of %1$s (1 - 12)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Day of week for %1$s~~',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Day of month for %1$s~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (hour)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (month)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (day of week)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (day of month)~~',
+	'UI:DashletGroupBy:MissingGroupBy' => 'Please select the field on which the objects will be grouped together~~',
+	'UI:DashletGroupByPie:Label' => 'Pie Chart~~',
+	'UI:DashletGroupByPie:Description' => 'Pie Chart~~',
+	'UI:DashletGroupByBars:Label' => 'Bar Chart~~',
+	'UI:DashletGroupByBars:Description' => 'Bar Chart~~',
+	'UI:DashletGroupByTable:Label' => 'Group By (table)~~',
+	'UI:DashletGroupByTable:Description' => 'List (Grouped by a field)~~',
+	'UI:DashletHeaderStatic:Label' => 'Header~~',
+	'UI:DashletHeaderStatic:Description' => 'Displays an horizontal separator~~',
+	'UI:DashletHeaderStatic:Prop-Title' => 'Title~~',
+	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacts~~',
+	'UI:DashletHeaderStatic:Prop-Icon' => 'Icon~~',
+	'UI:DashletHeaderDynamic:Label' => 'Header with statistics~~',
+	'UI:DashletHeaderDynamic:Description' => 'Header with stats (grouped by...)~~',
+	'UI:DashletHeaderDynamic:Prop-Title' => 'Title~~',
+	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contacts~~',
+	'UI:DashletHeaderDynamic:Prop-Icon' => 'Icon~~',
+	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Subtitle~~',
+	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contacts~~',
+	'UI:DashletHeaderDynamic:Prop-Query' => 'Query~~',
+	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Group by~~',
+	'UI:DashletHeaderDynamic:Prop-Values' => 'Values~~',
+	'UI:DashletBadge:Label' => 'Badge~~',
+	'UI:DashletBadge:Description' => 'Object Icon with new/search~~',
+	'UI:DashletBadge:Prop-Class' => 'Class~~',
+	'DayOfWeek-Sunday' => 'Sunday~~',
+	'DayOfWeek-Monday' => 'Monday~~',
+	'DayOfWeek-Tuesday' => 'Tuesday~~',
+	'DayOfWeek-Wednesday' => 'Wednesday~~',
+	'DayOfWeek-Thursday' => 'Thursday~~',
+	'DayOfWeek-Friday' => 'Friday~~',
+	'DayOfWeek-Saturday' => 'Saturday~~',
+	'Month-01' => 'January~~',
+	'Month-02' => 'February~~',
+	'Month-03' => 'March~~',
+	'Month-04' => 'April~~',
+	'Month-05' => 'May~~',
+	'Month-06' => 'June~~',
+	'Month-07' => 'July~~',
+	'Month-08' => 'August~~',
+	'Month-09' => 'September~~',
+	'Month-10' => 'October~~',
+	'Month-11' => 'November~~',
+	'Month-12' => 'December~~',
+	'DayOfWeek-Sunday-Min' => 'Su~~',
+	'DayOfWeek-Monday-Min' => 'Mo~~',
+	'DayOfWeek-Tuesday-Min' => 'Tu~~',
+	'DayOfWeek-Wednesday-Min' => 'We~~',
+	'DayOfWeek-Thursday-Min' => 'Th~~',
+	'DayOfWeek-Friday-Min' => 'Fr~~',
+	'DayOfWeek-Saturday-Min' => 'Sa~~',
+	'Month-01-Short' => 'Jan~~',
+	'Month-02-Short' => 'Feb~~',
+	'Month-03-Short' => 'Mar~~',
+	'Month-04-Short' => 'Apr~~',
+	'Month-05-Short' => 'May~~',
+	'Month-06-Short' => 'Jun~~',
+	'Month-07-Short' => 'Jul~~',
+	'Month-08-Short' => 'Aug~~',
+	'Month-09-Short' => 'Sep~~',
+	'Month-10-Short' => 'Oct~~',
+	'Month-11-Short' => 'Nov~~',
+	'Month-12-Short' => 'Dec~~',
+	'Calendar-FirstDayOfWeek' => '0~~',
+	'UI:Menu:ShortcutList' => 'Create a Shortcut...~~',
+	'UI:ShortcutRenameDlg:Title' => 'Rename the shortcut~~',
+	'UI:ShortcutListDlg:Title' => 'Create a shortcut for the list~~',
+	'UI:ShortcutDelete:Confirm' => 'Please confirm that wou wish to delete the shortcut(s).~~',
+	'Menu:MyShortcuts' => 'My Shortcuts~~',
+	'Class:Shortcut' => 'Shortcut~~',
+	'Class:Shortcut/Attribute:name' => 'Name~~',
+	'Class:Shortcut/Attribute:name+' => 'Label used in the menu and page title~~',
+	'Class:ShortcutOQL' => 'Search result shortcut~~',
+	'Class:ShortcutOQL/Attribute:oql' => 'Query~~',
+	'Class:ShortcutOQL/Attribute:oql+' => 'OQL defining the list of objects to search for~~',
+	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh~~',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled~~',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
+	'UI:FillAllMandatoryFields' => 'Please fill all mandatory fields.~~',
+	'UI:ValueMustBeSet' => 'Please specify a value~~',
+	'UI:ValueMustBeChanged' => 'Please change the value~~',
+	'UI:ValueInvalidFormat' => 'Invalid format~~',
+	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
+	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
+	'UI:CSVImportError_items' => 'Errors: %1$d~~',
+	'UI:CSVImportCreated_items' => 'Created: %1$d~~',
+	'UI:CSVImportModified_items' => 'Modified: %1$d~~',
+	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d~~',
+	'UI:Button:Remove' => 'Remove~~',
+	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
+	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
+	'UI:AboutBox' => 'About iTop...~~',
+	'UI:About:Title' => 'About iTop~~',
+	'UI:About:DataModel' => 'Data model~~',
+	'UI:About:Support' => 'Support information~~',
+	'UI:About:Licenses' => 'Licenses~~',
+	'UI:About:Modules' => 'Installed modules~~',
+	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
+	'UI:DisconnectedDlgTitle' => 'Warning!~~',
+	'UI:LoginAgain' => 'Login again~~',
+	'UI:StayOnThePage' => 'Stay on this page~~',
+	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
+	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
+	'ExcelExporter:ExportButton' => 'Export~~',
+	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
+	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
+	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
+	'ExcelExporter:Done' => 'Done.~~',
+	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
+	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
+	'ExcelExport:Statistics' => 'Statistics~~',
+	'portal:legacy_portal' => 'End-User Portal~~',
+	'portal:backoffice' => 'iTop Back-Office User Interface~~',
+	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
+	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
+	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
+	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
+	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
+	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
+	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
 ));
 ?>

+ 137 - 136
dictionaries/ja.dictionary.itop.ui.php

@@ -498,6 +498,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI:RunQuery:SerializedFilter' => 'シリアライズされたフィルタ:',
 	'UI:RunQuery:Error' => 'クエリ: %1$s 実行時にエラーが発生しました',
 	'UI:Query:UrlForExcel' => 'MS-Excel Webクエリに使用するURL',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
 	'UI:Schema:Title' => 'iTop オブジェクトスキーマ',
 	'UI:Schema:CategoryMenuItem' => 'カテゴリ <b>%1$s</b>',
 	'UI:Schema:Relationships' => '関係',
@@ -963,141 +964,141 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Shortcut/Attribute:name' => '名前',
 	'Class:Shortcut/Attribute:name+' => '',
 	'UI:FillAllMandatoryFields' => '全ての必須フィールドを入力ください。',
-	'Class:UserInternal' => 'User Internal~~',
-	'Class:UserInternal+' => 'User defined within iTop~~',
-	'UI:SearchValue:CheckAll' => 'Check All~~',
-	'UI:SearchValue:UncheckAll' => 'Uncheck All~~',
-	'UI:Login:ForgotPwd' => 'Forgot your password?~~',
-	'UI:Login:ForgotPwdForm' => 'Forgot your password~~',
-	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.~~',
-	'UI:Login:ResetPassword' => 'Send now!~~',
-	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
-	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
-	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
-	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
-	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
-	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
-	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...~~',
-	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
-	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href=\"%1$s\">enter a new password</a></p>.~~',
-	'UI:ResetPwd-Title' => 'Reset password~~',
-	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
-	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
-	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
-	'UI:ResetPwd-Login' => 'Click here to login...~~',
-	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
-	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
-	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
-	'UI:Search:Enlarge' => 'Broaden the search~~',
-	'UI:RelationGroups' => 'Groups~~',
-	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
-	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
-	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
-	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
-	'UI:Relation:NoneSelected' => 'None~~',
-	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
-	'UI:Relation:DrillDown' => 'Details...~~',
-	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
-	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
-	'UI:RelationOption:Untitled' => 'Untitled~~',
-	'UI:Relation:Key' => 'Key~~',
-	'UI:Relation:Comments' => 'Comments~~',
-	'UI:RelationOption:Title' => 'Title~~',
-	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
-	'UI:RelationOption:Comments' => 'Comments~~',
-	'UI:Button:Export' => 'Export~~',
-	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
-	'UI:PageFormat_A3' => 'A3~~',
-	'UI:PageFormat_A4' => 'A4~~',
-	'UI:PageFormat_Letter' => 'Letter~~',
-	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
-	'UI:PageOrientation_Portrait' => 'Portrait~~',
-	'UI:PageOrientation_Landscape' => 'Landscape~~',
-	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
-	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
-	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
-	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
-	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~',
-	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
-	'Month-01' => 'January~~',
-	'Month-02' => 'February~~',
-	'Month-03' => 'March~~',
-	'Month-04' => 'April~~',
-	'Month-05' => 'May~~',
-	'Month-06' => 'June~~',
-	'Month-07' => 'July~~',
-	'Month-08' => 'August~~',
-	'Month-09' => 'September~~',
-	'Month-10' => 'October~~',
-	'Month-11' => 'November~~',
-	'Month-12' => 'December~~',
-	'DayOfWeek-Sunday-Min' => 'Su~~',
-	'DayOfWeek-Monday-Min' => 'Mo~~',
-	'DayOfWeek-Tuesday-Min' => 'Tu~~',
-	'DayOfWeek-Wednesday-Min' => 'We~~',
-	'DayOfWeek-Thursday-Min' => 'Th~~',
-	'DayOfWeek-Friday-Min' => 'Fr~~',
-	'DayOfWeek-Saturday-Min' => 'Sa~~',
-	'Month-01-Short' => 'Jan~~',
-	'Month-02-Short' => 'Feb~~',
-	'Month-03-Short' => 'Mar~~',
-	'Month-04-Short' => 'Apr~~',
-	'Month-05-Short' => 'May~~',
-	'Month-06-Short' => 'Jun~~',
-	'Month-07-Short' => 'Jul~~',
-	'Month-08-Short' => 'Aug~~',
-	'Month-09-Short' => 'Sep~~',
-	'Month-10-Short' => 'Oct~~',
-	'Month-11-Short' => 'Nov~~',
-	'Month-12-Short' => 'Dec~~',
-	'Calendar-FirstDayOfWeek' => '0~~',
-	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh~~',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled~~',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
-	'UI:ValueMustBeSet' => 'Please specify a value~~',
-	'UI:ValueMustBeChanged' => 'Please change the value~~',
-	'UI:ValueInvalidFormat' => 'Invalid format~~',
-	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
-	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
-	'UI:CSVImportError_items' => 'Errors: %1$d~~',
-	'UI:CSVImportCreated_items' => 'Created: %1$d~~',
-	'UI:CSVImportModified_items' => 'Modified: %1$d~~',
-	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d~~',
-	'UI:Button:Remove' => 'Remove~~',
-	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
-	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
-	'UI:AboutBox' => 'About iTop...~~',
-	'UI:About:Title' => 'About iTop~~',
-	'UI:About:DataModel' => 'Data model~~',
-	'UI:About:Support' => 'Support information~~',
-	'UI:About:Licenses' => 'Licenses~~',
-	'UI:About:Modules' => 'Installed modules~~',
-	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
-	'UI:DisconnectedDlgTitle' => 'Warning!~~',
-	'UI:LoginAgain' => 'Login again~~',
-	'UI:StayOnThePage' => 'Stay on this page~~',
-	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
-	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
-	'ExcelExporter:ExportButton' => 'Export~~',
-	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
-	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
-	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
-	'ExcelExporter:Done' => 'Done.~~',
-	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
-	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
-	'ExcelExport:Statistics' => 'Statistics~~',
-	'portal:legacy_portal' => 'End-User Portal~~',
-	'portal:backoffice' => 'iTop Back-Office User Interface~~',
-	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
-	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
-	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
-	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
-	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
-	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
-	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
+	'Class:UserInternal' => 'User Internal~~',
+	'Class:UserInternal+' => 'User defined within iTop~~',
+	'UI:SearchValue:CheckAll' => 'Check All~~',
+	'UI:SearchValue:UncheckAll' => 'Uncheck All~~',
+	'UI:Login:ForgotPwd' => 'Forgot your password?~~',
+	'UI:Login:ForgotPwdForm' => 'Forgot your password~~',
+	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.~~',
+	'UI:Login:ResetPassword' => 'Send now!~~',
+	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
+	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
+	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
+	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
+	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
+	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
+	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
+	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
+	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...~~',
+	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
+	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href=\"%1$s\">enter a new password</a></p>.~~',
+	'UI:ResetPwd-Title' => 'Reset password~~',
+	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
+	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
+	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
+	'UI:ResetPwd-Login' => 'Click here to login...~~',
+	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
+	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
+	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
+	'UI:Search:Enlarge' => 'Broaden the search~~',
+	'UI:RelationGroups' => 'Groups~~',
+	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
+	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
+	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
+	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
+	'UI:Relation:NoneSelected' => 'None~~',
+	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
+	'UI:Relation:DrillDown' => 'Details...~~',
+	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
+	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
+	'UI:RelationOption:Untitled' => 'Untitled~~',
+	'UI:Relation:Key' => 'Key~~',
+	'UI:Relation:Comments' => 'Comments~~',
+	'UI:RelationOption:Title' => 'Title~~',
+	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
+	'UI:RelationOption:Comments' => 'Comments~~',
+	'UI:Button:Export' => 'Export~~',
+	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
+	'UI:PageFormat_A3' => 'A3~~',
+	'UI:PageFormat_A4' => 'A4~~',
+	'UI:PageFormat_Letter' => 'Letter~~',
+	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
+	'UI:PageOrientation_Portrait' => 'Portrait~~',
+	'UI:PageOrientation_Landscape' => 'Landscape~~',
+	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
+	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
+	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
+	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
+	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~',
+	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
+	'Month-01' => 'January~~',
+	'Month-02' => 'February~~',
+	'Month-03' => 'March~~',
+	'Month-04' => 'April~~',
+	'Month-05' => 'May~~',
+	'Month-06' => 'June~~',
+	'Month-07' => 'July~~',
+	'Month-08' => 'August~~',
+	'Month-09' => 'September~~',
+	'Month-10' => 'October~~',
+	'Month-11' => 'November~~',
+	'Month-12' => 'December~~',
+	'DayOfWeek-Sunday-Min' => 'Su~~',
+	'DayOfWeek-Monday-Min' => 'Mo~~',
+	'DayOfWeek-Tuesday-Min' => 'Tu~~',
+	'DayOfWeek-Wednesday-Min' => 'We~~',
+	'DayOfWeek-Thursday-Min' => 'Th~~',
+	'DayOfWeek-Friday-Min' => 'Fr~~',
+	'DayOfWeek-Saturday-Min' => 'Sa~~',
+	'Month-01-Short' => 'Jan~~',
+	'Month-02-Short' => 'Feb~~',
+	'Month-03-Short' => 'Mar~~',
+	'Month-04-Short' => 'Apr~~',
+	'Month-05-Short' => 'May~~',
+	'Month-06-Short' => 'Jun~~',
+	'Month-07-Short' => 'Jul~~',
+	'Month-08-Short' => 'Aug~~',
+	'Month-09-Short' => 'Sep~~',
+	'Month-10-Short' => 'Oct~~',
+	'Month-11-Short' => 'Nov~~',
+	'Month-12-Short' => 'Dec~~',
+	'Calendar-FirstDayOfWeek' => '0~~',
+	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh~~',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled~~',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
+	'UI:ValueMustBeSet' => 'Please specify a value~~',
+	'UI:ValueMustBeChanged' => 'Please change the value~~',
+	'UI:ValueInvalidFormat' => 'Invalid format~~',
+	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
+	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
+	'UI:CSVImportError_items' => 'Errors: %1$d~~',
+	'UI:CSVImportCreated_items' => 'Created: %1$d~~',
+	'UI:CSVImportModified_items' => 'Modified: %1$d~~',
+	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d~~',
+	'UI:Button:Remove' => 'Remove~~',
+	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
+	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
+	'UI:AboutBox' => 'About iTop...~~',
+	'UI:About:Title' => 'About iTop~~',
+	'UI:About:DataModel' => 'Data model~~',
+	'UI:About:Support' => 'Support information~~',
+	'UI:About:Licenses' => 'Licenses~~',
+	'UI:About:Modules' => 'Installed modules~~',
+	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
+	'UI:DisconnectedDlgTitle' => 'Warning!~~',
+	'UI:LoginAgain' => 'Login again~~',
+	'UI:StayOnThePage' => 'Stay on this page~~',
+	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
+	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
+	'ExcelExporter:ExportButton' => 'Export~~',
+	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
+	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
+	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
+	'ExcelExporter:Done' => 'Done.~~',
+	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
+	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
+	'ExcelExport:Statistics' => 'Statistics~~',
+	'portal:legacy_portal' => 'End-User Portal~~',
+	'portal:backoffice' => 'iTop Back-Office User Interface~~',
+	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
+	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
+	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
+	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
+	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
+	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
+	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
 ));
 ?>

+ 79 - 78
dictionaries/nl.dictionary.itop.ui.php

@@ -656,6 +656,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:RunQuery:SerializedFilter' => 'Serialized filter: ',
 	'UI:RunQuery:Error' => 'Een fout is opgetreden tijdens het runnen van query: %1$s',
 	'UI:Query:UrlForExcel' => 'URL om te gebruiken voor MS-Excel web queries',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
 	'UI:Schema:Title' => 'iTop objecten schema',
 	'UI:Schema:CategoryMenuItem' => 'Categorie <b>%1$s</b>',
 	'UI:Schema:Relationships' => 'Relaties',
@@ -1210,83 +1211,83 @@ Indien gekoppeld aan een Trigger, wordt aan elke actie een "orde" nummer gegeven
 	'UI:About:Support' => 'Support informatie',
 	'UI:About:Licenses' => 'Licenties',
 	'UI:About:Modules' => 'Geïnstalleerde modules',
-	'Menu:CSVImportMenu' => 'CSV import~~',
-	'Menu:CSVImportMenu+' => 'Bulk creation or update~~',
-	'Menu:DataAdministration' => 'Data administratie',
-	'Menu:DataAdministration+' => 'Data administratie',
-	'UI:RelationGroups' => 'Groups~~',
-	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
-	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
-	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
-	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
-	'UI:Relation:NoneSelected' => 'None~~',
-	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
-	'UI:Relation:DrillDown' => 'Details...~~',
-	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
-	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
-	'UI:RelationOption:Untitled' => 'Untitled~~',
-	'UI:Relation:Key' => 'Key~~',
-	'UI:Relation:Comments' => 'Comments~~',
-	'UI:RelationOption:Title' => 'Title~~',
-	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
-	'UI:RelationOption:Comments' => 'Comments~~',
-	'UI:Button:Export' => 'Export~~',
-	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
-	'UI:PageFormat_A3' => 'A3~~',
-	'UI:PageFormat_A4' => 'A4~~',
-	'UI:PageFormat_Letter' => 'Letter~~',
-	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
-	'UI:PageOrientation_Portrait' => 'Portrait~~',
-	'UI:PageOrientation_Landscape' => 'Landscape~~',
-	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
-	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
-	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
-	'DayOfWeek-Sunday-Min' => 'Su~~',
-	'DayOfWeek-Monday-Min' => 'Mo~~',
-	'DayOfWeek-Tuesday-Min' => 'Tu~~',
-	'DayOfWeek-Wednesday-Min' => 'We~~',
-	'DayOfWeek-Thursday-Min' => 'Th~~',
-	'DayOfWeek-Friday-Min' => 'Fr~~',
-	'DayOfWeek-Saturday-Min' => 'Sa~~',
-	'Month-01-Short' => 'Jan~~',
-	'Month-02-Short' => 'Feb~~',
-	'Month-03-Short' => 'Mar~~',
-	'Month-04-Short' => 'Apr~~',
-	'Month-05-Short' => 'May~~',
-	'Month-06-Short' => 'Jun~~',
-	'Month-07-Short' => 'Jul~~',
-	'Month-08-Short' => 'Aug~~',
-	'Month-09-Short' => 'Sep~~',
-	'Month-10-Short' => 'Oct~~',
-	'Month-11-Short' => 'Nov~~',
-	'Month-12-Short' => 'Dec~~',
-	'Calendar-FirstDayOfWeek' => '0~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
-	'UI:ValueMustBeSet' => 'Please specify a value~~',
-	'UI:ValueMustBeChanged' => 'Please change the value~~',
-	'UI:ValueInvalidFormat' => 'Invalid format~~',
-	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
-	'UI:DisconnectedDlgTitle' => 'Warning!~~',
-	'UI:LoginAgain' => 'Login again~~',
-	'UI:StayOnThePage' => 'Stay on this page~~',
-	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
-	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
-	'ExcelExporter:ExportButton' => 'Export~~',
-	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
-	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
-	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
-	'ExcelExporter:Done' => 'Done.~~',
-	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
-	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
-	'ExcelExport:Statistics' => 'Statistics~~',
-	'portal:legacy_portal' => 'End-User Portal~~',
-	'portal:backoffice' => 'iTop Back-Office User Interface~~',
-	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
-	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
-	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
-	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
-	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
-	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
-	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
+	'Menu:CSVImportMenu' => 'CSV import~~',
+	'Menu:CSVImportMenu+' => 'Bulk creation or update~~',
+	'Menu:DataAdministration' => 'Data administratie',
+	'Menu:DataAdministration+' => 'Data administratie',
+	'UI:RelationGroups' => 'Groups~~',
+	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
+	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
+	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
+	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
+	'UI:Relation:NoneSelected' => 'None~~',
+	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
+	'UI:Relation:DrillDown' => 'Details...~~',
+	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
+	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
+	'UI:RelationOption:Untitled' => 'Untitled~~',
+	'UI:Relation:Key' => 'Key~~',
+	'UI:Relation:Comments' => 'Comments~~',
+	'UI:RelationOption:Title' => 'Title~~',
+	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
+	'UI:RelationOption:Comments' => 'Comments~~',
+	'UI:Button:Export' => 'Export~~',
+	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
+	'UI:PageFormat_A3' => 'A3~~',
+	'UI:PageFormat_A4' => 'A4~~',
+	'UI:PageFormat_Letter' => 'Letter~~',
+	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
+	'UI:PageOrientation_Portrait' => 'Portrait~~',
+	'UI:PageOrientation_Landscape' => 'Landscape~~',
+	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
+	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
+	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
+	'DayOfWeek-Sunday-Min' => 'Su~~',
+	'DayOfWeek-Monday-Min' => 'Mo~~',
+	'DayOfWeek-Tuesday-Min' => 'Tu~~',
+	'DayOfWeek-Wednesday-Min' => 'We~~',
+	'DayOfWeek-Thursday-Min' => 'Th~~',
+	'DayOfWeek-Friday-Min' => 'Fr~~',
+	'DayOfWeek-Saturday-Min' => 'Sa~~',
+	'Month-01-Short' => 'Jan~~',
+	'Month-02-Short' => 'Feb~~',
+	'Month-03-Short' => 'Mar~~',
+	'Month-04-Short' => 'Apr~~',
+	'Month-05-Short' => 'May~~',
+	'Month-06-Short' => 'Jun~~',
+	'Month-07-Short' => 'Jul~~',
+	'Month-08-Short' => 'Aug~~',
+	'Month-09-Short' => 'Sep~~',
+	'Month-10-Short' => 'Oct~~',
+	'Month-11-Short' => 'Nov~~',
+	'Month-12-Short' => 'Dec~~',
+	'Calendar-FirstDayOfWeek' => '0~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
+	'UI:ValueMustBeSet' => 'Please specify a value~~',
+	'UI:ValueMustBeChanged' => 'Please change the value~~',
+	'UI:ValueInvalidFormat' => 'Invalid format~~',
+	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
+	'UI:DisconnectedDlgTitle' => 'Warning!~~',
+	'UI:LoginAgain' => 'Login again~~',
+	'UI:StayOnThePage' => 'Stay on this page~~',
+	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
+	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
+	'ExcelExporter:ExportButton' => 'Export~~',
+	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
+	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
+	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
+	'ExcelExporter:Done' => 'Done.~~',
+	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
+	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
+	'ExcelExport:Statistics' => 'Statistics~~',
+	'portal:legacy_portal' => 'End-User Portal~~',
+	'portal:backoffice' => 'iTop Back-Office User Interface~~',
+	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
+	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
+	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
+	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
+	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
+	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
+	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
 ));
 ?>

+ 87 - 86
dictionaries/pt_br.dictionary.itop.ui.php

@@ -648,6 +648,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI:RunQuery:SerializedFilter' => 'Filtro serializado: ',
 	'UI:RunQuery:Error' => 'Ocorreu um erro ao executar a consulta: %1$s',
 	'UI:Query:UrlForExcel' => 'URL a ser usada para consultas web MS-Excel',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
 	'UI:Schema:Title' => 'Esquema de objetos',
 	'UI:Schema:CategoryMenuItem' => 'Categoria <b>%1$s</b>',
 	'UI:Schema:Relationships' => 'Relações',
@@ -1193,91 +1194,91 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Button:Remove' => 'Excluir',
 	'UI:AddAnExisting_Class' => 'Adicionar objetos do tipo %1$s...',
 	'UI:SelectionOf_Class' => 'Selecionar objetos do tipo %1$s',
-	'Class:UserInternal' => 'User Internal~~',
-	'Class:UserInternal+' => 'User defined within iTop~~',
-	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
-	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
-	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
-	'UI:Search:Enlarge' => 'Broaden the search~~',
-	'UI:RelationGroups' => 'Groups~~',
-	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
-	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
-	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
-	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
-	'UI:Relation:NoneSelected' => 'None~~',
-	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
-	'UI:Relation:DrillDown' => 'Details...~~',
-	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
-	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
-	'UI:RelationOption:Untitled' => 'Untitled~~',
-	'UI:Relation:Key' => 'Key~~',
-	'UI:Relation:Comments' => 'Comments~~',
-	'UI:RelationOption:Title' => 'Title~~',
-	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
-	'UI:RelationOption:Comments' => 'Comments~~',
-	'UI:Button:Export' => 'Export~~',
-	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
-	'UI:PageFormat_A3' => 'A3~~',
-	'UI:PageFormat_A4' => 'A4~~',
-	'UI:PageFormat_Letter' => 'Letter~~',
-	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
-	'UI:PageOrientation_Portrait' => 'Portrait~~',
-	'UI:PageOrientation_Landscape' => 'Landscape~~',
-	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
-	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
-	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
-	'Portal:SelectRequestTemplate' => 'Selecione um modelo para %1$s',
-	'DayOfWeek-Sunday-Min' => 'Su~~',
-	'DayOfWeek-Monday-Min' => 'Mo~~',
-	'DayOfWeek-Tuesday-Min' => 'Tu~~',
-	'DayOfWeek-Wednesday-Min' => 'We~~',
-	'DayOfWeek-Thursday-Min' => 'Th~~',
-	'DayOfWeek-Friday-Min' => 'Fr~~',
-	'DayOfWeek-Saturday-Min' => 'Sa~~',
-	'Month-01-Short' => 'Jan~~',
-	'Month-02-Short' => 'Feb~~',
-	'Month-03-Short' => 'Mar~~',
-	'Month-04-Short' => 'Apr~~',
-	'Month-05-Short' => 'May~~',
-	'Month-06-Short' => 'Jun~~',
-	'Month-07-Short' => 'Jul~~',
-	'Month-08-Short' => 'Aug~~',
-	'Month-09-Short' => 'Sep~~',
-	'Month-10-Short' => 'Oct~~',
-	'Month-11-Short' => 'Nov~~',
-	'Month-12-Short' => 'Dec~~',
-	'Calendar-FirstDayOfWeek' => '0~~',
-	'UI:ValueMustBeSet' => 'Please specify a value~~',
-	'UI:ValueMustBeChanged' => 'Please change the value~~',
-	'UI:ValueInvalidFormat' => 'Invalid format~~',
-	'UI:AboutBox' => 'About iTop...~~',
-	'UI:About:Title' => 'About iTop~~',
-	'UI:About:DataModel' => 'Data model~~',
-	'UI:About:Support' => 'Support information~~',
-	'UI:About:Licenses' => 'Licenses~~',
-	'UI:About:Modules' => 'Installed modules~~',
-	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
-	'UI:DisconnectedDlgTitle' => 'Warning!~~',
-	'UI:LoginAgain' => 'Login again~~',
-	'UI:StayOnThePage' => 'Stay on this page~~',
-	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
-	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
-	'ExcelExporter:ExportButton' => 'Export~~',
-	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
-	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
-	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
-	'ExcelExporter:Done' => 'Done.~~',
-	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
-	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
-	'ExcelExport:Statistics' => 'Statistics~~',
-	'portal:legacy_portal' => 'End-User Portal~~',
-	'portal:backoffice' => 'iTop Back-Office User Interface~~',
-	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
-	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
-	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
-	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
-	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
-	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
-	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
+	'Class:UserInternal' => 'User Internal~~',
+	'Class:UserInternal+' => 'User defined within iTop~~',
+	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
+	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
+	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
+	'UI:Search:Enlarge' => 'Broaden the search~~',
+	'UI:RelationGroups' => 'Groups~~',
+	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
+	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
+	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
+	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
+	'UI:Relation:NoneSelected' => 'None~~',
+	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
+	'UI:Relation:DrillDown' => 'Details...~~',
+	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
+	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
+	'UI:RelationOption:Untitled' => 'Untitled~~',
+	'UI:Relation:Key' => 'Key~~',
+	'UI:Relation:Comments' => 'Comments~~',
+	'UI:RelationOption:Title' => 'Title~~',
+	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
+	'UI:RelationOption:Comments' => 'Comments~~',
+	'UI:Button:Export' => 'Export~~',
+	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
+	'UI:PageFormat_A3' => 'A3~~',
+	'UI:PageFormat_A4' => 'A4~~',
+	'UI:PageFormat_Letter' => 'Letter~~',
+	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
+	'UI:PageOrientation_Portrait' => 'Portrait~~',
+	'UI:PageOrientation_Landscape' => 'Landscape~~',
+	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
+	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
+	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
+	'Portal:SelectRequestTemplate' => 'Selecione um modelo para %1$s',
+	'DayOfWeek-Sunday-Min' => 'Su~~',
+	'DayOfWeek-Monday-Min' => 'Mo~~',
+	'DayOfWeek-Tuesday-Min' => 'Tu~~',
+	'DayOfWeek-Wednesday-Min' => 'We~~',
+	'DayOfWeek-Thursday-Min' => 'Th~~',
+	'DayOfWeek-Friday-Min' => 'Fr~~',
+	'DayOfWeek-Saturday-Min' => 'Sa~~',
+	'Month-01-Short' => 'Jan~~',
+	'Month-02-Short' => 'Feb~~',
+	'Month-03-Short' => 'Mar~~',
+	'Month-04-Short' => 'Apr~~',
+	'Month-05-Short' => 'May~~',
+	'Month-06-Short' => 'Jun~~',
+	'Month-07-Short' => 'Jul~~',
+	'Month-08-Short' => 'Aug~~',
+	'Month-09-Short' => 'Sep~~',
+	'Month-10-Short' => 'Oct~~',
+	'Month-11-Short' => 'Nov~~',
+	'Month-12-Short' => 'Dec~~',
+	'Calendar-FirstDayOfWeek' => '0~~',
+	'UI:ValueMustBeSet' => 'Please specify a value~~',
+	'UI:ValueMustBeChanged' => 'Please change the value~~',
+	'UI:ValueInvalidFormat' => 'Invalid format~~',
+	'UI:AboutBox' => 'About iTop...~~',
+	'UI:About:Title' => 'About iTop~~',
+	'UI:About:DataModel' => 'Data model~~',
+	'UI:About:Support' => 'Support information~~',
+	'UI:About:Licenses' => 'Licenses~~',
+	'UI:About:Modules' => 'Installed modules~~',
+	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
+	'UI:DisconnectedDlgTitle' => 'Warning!~~',
+	'UI:LoginAgain' => 'Login again~~',
+	'UI:StayOnThePage' => 'Stay on this page~~',
+	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
+	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
+	'ExcelExporter:ExportButton' => 'Export~~',
+	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
+	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
+	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
+	'ExcelExporter:Done' => 'Done.~~',
+	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
+	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
+	'ExcelExport:Statistics' => 'Statistics~~',
+	'portal:legacy_portal' => 'End-User Portal~~',
+	'portal:backoffice' => 'iTop Back-Office User Interface~~',
+	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
+	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
+	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
+	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
+	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
+	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
+	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
 ));
 ?>

+ 1 - 0
dictionaries/ru.dictionary.itop.ui.php

@@ -644,6 +644,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:RunQuery:SerializedFilter' => 'Сериализованные фильты: ',
 	'UI:RunQuery:Error' => 'Ошибка при выполнении запроса: %1$s',
 	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries~~',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
 	'UI:Schema:Title' => 'iTop схема объектов',
 	'UI:Schema:CategoryMenuItem' => 'Категория <b>%1$s</b>',
 	'UI:Schema:Relationships' => 'Отношения',

+ 382 - 381
dictionaries/tr.dictionary.itop.ui.php

@@ -866,387 +866,388 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 
 	'Enum:Undefined' => 'Tanımsız',
 	'UI:Button:Refresh' => 'Yenile',
-	'Class:Query' => 'Query~~',
-	'Class:Query+' => 'A query is a data set defined in a dynamic way~~',
-	'Class:Query/Attribute:name' => 'Name~~',
-	'Class:Query/Attribute:name+' => 'Identifies the query~~',
-	'Class:Query/Attribute:description' => 'Description~~',
-	'Class:Query/Attribute:description+' => 'Long description for the query (purpose, usage, etc.)~~',
-	'Class:Query/Attribute:fields' => 'Fields~~',
-	'Class:Query/Attribute:fields+' => 'Coma separated list of attributes (or alias.attribute) to export~~',
-	'Class:QueryOQL' => 'OQL Query~~',
-	'Class:QueryOQL+' => 'A query based on the Object Query Language~~',
-	'Class:QueryOQL/Attribute:oql' => 'Expression~~',
-	'Class:QueryOQL/Attribute:oql+' => 'OQL Expression~~',
-	'Class:UserInternal' => 'User Internal~~',
-	'Class:UserInternal+' => 'User defined within iTop~~',
-	'UI:Button:Save' => 'Save~~',
-	'UI:Button:Restart' => ' |<< Restart ~~',
-	'UI:Button:Rename' => ' Rename... ~~',
-	'UI:History:BulkImports' => 'History~~',
-	'UI:History:BulkImports+' => 'List of CSV imports (latest import first)~~',
-	'UI:History:BulkImportDetails' => 'Changes resulting from the CSV import performed on %1$s (by %2$s)~~',
-	'UI:History:StatsCreations' => 'Created~~',
-	'UI:History:StatsCreations+' => 'Count of objects created~~',
-	'UI:History:StatsModifs' => 'Modified~~',
-	'UI:History:StatsModifs+' => 'Count of objects modified~~',
-	'UI:History:StatsDeletes' => 'Deleted~~',
-	'UI:History:StatsDeletes+' => 'Count of objects deleted~~',
-	'UI:SplitDateTime-Date' => 'date~~',
-	'UI:SplitDateTime-Time' => 'time~~',
-	'UI:SearchValue:NbSelected' => '# selected~~',
-	'UI:SearchValue:CheckAll' => 'Check All~~',
-	'UI:SearchValue:UncheckAll' => 'Uncheck All~~',
-	'UI:Login:ForgotPwd' => 'Forgot your password?~~',
-	'UI:Login:ForgotPwdForm' => 'Forgot your password~~',
-	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.~~',
-	'UI:Login:ResetPassword' => 'Send now!~~',
-	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
-	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
-	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
-	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
-	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
-	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
-	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...~~',
-	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
-	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href=\"%1$s\">enter a new password</a></p>.~~',
-	'UI:ResetPwd-Title' => 'Reset password~~',
-	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
-	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
-	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
-	'UI:ResetPwd-Login' => 'Click here to login...~~',
-	'UI:Login:PasswordChanged' => 'Password successfully set!~~',
-	'UI:AccessRO-All' => 'iTop is read-only~~',
-	'UI:AccessRO-Users' => 'iTop is read-only for end-users~~',
-	'UI:ApplicationEnvironment' => 'Application environment: %1$s~~',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronization of %1$d objects of class %2$s~~',
-	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
-	'UI:CSVReport-Value-Modified' => 'Modified~~',
-	'UI:CSVReport-Value-SetIssue' => 'Could not be changed - reason: %1$s~~',
-	'UI:CSVReport-Value-ChangeIssue' => 'Could not be changed to %1$s - reason: %2$s~~',
-	'UI:CSVReport-Value-NoMatch' => 'No match~~',
-	'UI:CSVReport-Value-Missing' => 'Missing mandatory value~~',
-	'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects~~',
-	'UI:CSVReport-Row-Unchanged' => 'unchanged~~',
-	'UI:CSVReport-Row-Created' => 'created~~',
-	'UI:CSVReport-Row-Updated' => 'updated %1$d cols~~',
-	'UI:CSVReport-Row-Disappeared' => 'disappeared, changed %1$d cols~~',
-	'UI:CSVReport-Row-Issue' => 'Issue: %1$s~~',
-	'UI:CSVReport-Value-Issue-Null' => 'Null not allowed~~',
-	'UI:CSVReport-Value-Issue-NotFound' => 'Object not found~~',
-	'UI:CSVReport-Value-Issue-FoundMany' => 'Found %1$d matches~~',
-	'UI:CSVReport-Value-Issue-Readonly' => 'The attribute \'%1$s\' is read-only and cannot be modified (current value: %2$s, proposed value: %3$s)~~',
-	'UI:CSVReport-Value-Issue-Format' => 'Failed to process input: %1$s~~',
-	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling~~',
-	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s~~',
-	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributes not consistent with each others: %1$s~~',
-	'UI:CSVReport-Row-Issue-Attribute' => 'Unexpected attribute value(s)~~',
-	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Could not be created, due to missing external key(s): %1$s~~',
-	'UI:CSVReport-Row-Issue-DateFormat' => 'wrong date format~~',
-	'UI:CSVReport-Row-Issue-Reconciliation' => 'failed to reconcile~~',
-	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation~~',
-	'UI:CSVReport-Row-Issue-Internal' => 'Internal error: %1$s, %2$s~~',
-	'UI:CSVReport-Icon-Unchanged' => 'Unchanged~~',
-	'UI:CSVReport-Icon-Modified' => 'Modified~~',
-	'UI:CSVReport-Icon-Missing' => 'Missing~~',
-	'UI:CSVReport-Object-MissingToUpdate' => 'Missing object: will be updated~~',
-	'UI:CSVReport-Object-MissingUpdated' => 'Missing object: updated~~',
-	'UI:CSVReport-Icon-Created' => 'Created~~',
-	'UI:CSVReport-Object-ToCreate' => 'Object will be created~~',
-	'UI:CSVReport-Object-Created' => 'Object created~~',
-	'UI:CSVReport-Icon-Error' => 'Error~~',
-	'UI:CSVReport-Object-Error' => 'ERROR: %1$s~~',
-	'UI:CSVReport-Object-Ambiguous' => 'AMBIGUOUS: %1$s~~',
-	'UI:CSVReport-Stats-Errors' => '%1$.0f %% of the loaded objects have errors and will be ignored.~~',
-	'UI:CSVReport-Stats-Created' => '%1$.0f %% of the loaded objects will be created.~~',
-	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of the loaded objects will be modified.~~',
-	'UI:CSVExport:AdvancedMode' => 'Advanced mode~~',
-	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.~~',
-	'UI:CSVExport:LostChars' => 'Encoding issue~~',
-	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').~~',
-	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in the Rule %1$s: %2$s.~~',
-	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in the Category %1$s: %2$s.~~',
-	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries~~',
-	'UI:Edit:TestQuery' => 'Test query~~',
-	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'This object could not be deleted because some manual operations must be performed prior to that~~',
-	'UI:Delete:Deleted' => 'deleted~~',
-	'UI:Delete:CannotDeleteBecause' => 'Could not be deleted: %1$s~~',
-	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Should be automaticaly deleted, but this is not feasible: %1$s~~',
-	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Must be deleted manually, but this is not feasible: %1$s~~',
-	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
-	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
-	'UI:Search:Enlarge' => 'Broaden the search~~',
-	'Menu:QueryMenu' => 'Query phrasebook~~',
-	'Menu:QueryMenu+' => 'Query phrasebook~~',
-	'UI:Download-CSV' => 'Download %1$s~~',
-	'UI:RelationGroups' => 'Groups~~',
-	'UI:OperationCancelled' => 'Operation Cancelled~~',
-	'UI:ElementsDisplayed' => 'Filtering~~',
-	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
-	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
-	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
-	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
-	'UI:Relation:NoneSelected' => 'None~~',
-	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
-	'UI:Relation:DrillDown' => 'Details...~~',
-	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
-	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
-	'UI:RelationOption:Untitled' => 'Untitled~~',
-	'UI:Relation:Key' => 'Key~~',
-	'UI:Relation:Comments' => 'Comments~~',
-	'UI:RelationOption:Title' => 'Title~~',
-	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
-	'UI:RelationOption:Comments' => 'Comments~~',
-	'UI:Button:Export' => 'Export~~',
-	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
-	'UI:PageFormat_A3' => 'A3~~',
-	'UI:PageFormat_A4' => 'A4~~',
-	'UI:PageFormat_Letter' => 'Letter~~',
-	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
-	'UI:PageOrientation_Portrait' => 'Portrait~~',
-	'UI:PageOrientation_Landscape' => 'Landscape~~',
-	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
-	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
-	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
-	'Portal:NoRequestMgmt' => 'Dear %1$s, you have been redirected to this page because your account is configured with the profile \'Portal user\'. Unfortunately, iTop has not been installed with the feature \'Request Management\'. Please contact your administrator.~~',
-	'Portal:TitleDetailsFor_Request' => 'Details for request~~',
-	'Portal:Attachments' => 'Attachments~~',
-	'Portal:AddAttachment' => ' Add Attachment ~~',
-	'Portal:RemoveAttachment' => ' Remove Attachment ~~',
-	'Portal:Attachment_No_To_Ticket_Name' => 'Attachment #%1$d to %2$s (%3$s)~~',
-	'Portal:SelectRequestTemplate' => 'Select a template for %1$s~~',
-	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Days %2$s Hours %3$s Minutes %4$s Seconds~~',
-	'UI:ModifyAllPageTitle' => 'Modify All~~',
-	'UI:Modify_N_ObjectsOf_Class' => 'Modifying %1$d objects of class %2$s~~',
-	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifying %1$d objects of class %2$s out of %3$d~~',
-	'UI:Menu:ModifyAll' => 'Modify...~~',
-	'UI:Button:ModifyAll' => 'Modify All~~',
-	'UI:Button:PreviewModifications' => 'Preview Modifications >>~~',
-	'UI:ModifiedObject' => 'Object Modified~~',
-	'UI:BulkModifyStatus' => 'Operation~~',
-	'UI:BulkModifyStatus+' => 'Status of the operation~~',
-	'UI:BulkModifyErrors' => 'Errors (if any)~~',
-	'UI:BulkModifyErrors+' => 'Errors preventing the modification~~',
-	'UI:BulkModifyStatusOk' => 'Ok~~',
-	'UI:BulkModifyStatusError' => 'Error~~',
-	'UI:BulkModifyStatusModified' => 'Modified~~',
-	'UI:BulkModifyStatusSkipped' => 'Skipped~~',
-	'UI:BulkModify_Count_DistinctValues' => '%1$d distinct values:~~',
-	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d time(s)~~',
-	'UI:BulkModify:N_MoreValues' => '%1$d more values...~~',
-	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Attempting to set the read-only field: %1$s~~',
-	'UI:FailedToApplyStimuli' => 'The action has failed.~~',
-	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Modifying %2$d objects of class %3$s~~',
-	'UI:CaseLogTypeYourTextHere' => 'Type your text here:~~',
-	'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.~~',
-	'UI:Pagination:HeaderSelection' => 'Total: %1$s objects (%2$s objects selected).~~',
-	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objects.~~',
-	'UI:Pagination:PageSize' => '%1$s objects per page~~',
-	'UI:Pagination:PagesLabel' => 'Pages:~~',
-	'UI:Pagination:All' => 'All~~',
-	'UI:HierarchyOf_Class' => 'Hierarchy of %1$s~~',
-	'UI:Preferences' => 'Preferences...~~',
-	'UI:FavoriteOrganizations' => 'Favorite Organizations~~',
-	'UI:FavoriteOrganizations+' => 'Check in the list below the organizations that you want to see in the drop-down menu for a quick access. Note that this is not a security setting, objects from any organization are still visible and can be accessed by selecting \"All Organizations\" in the drop-down list.~~',
-	'UI:FavoriteLanguage' => 'Language of the User Interface~~',
-	'UI:Favorites:SelectYourLanguage' => 'Select your preferred language~~',
-	'UI:FavoriteOtherSettings' => 'Other Settings~~',
-	'UI:Favorites:Default_X_ItemsPerPage' => 'Default length for lists:  %1$s items per page~~',
-	'UI:NavigateAwayConfirmationMessage' => 'Any modification will be discarded.~~',
-	'UI:CancelConfirmationMessage' => 'You will loose your changes. Continue anyway?~~',
-	'UI:AutoApplyConfirmationMessage' => 'Some changes have not been applied yet. Do you want itop to take them into account?~~',
-	'UI:Create_Class_InState' => 'Create the %1$s in state: ~~',
-	'UI:OrderByHint_Values' => 'Sort order: %1$s~~',
-	'UI:Menu:AddToDashboard' => 'Add To Dashboard...~~',
-	'UI:ConfigureThisList' => 'Configure This List...~~',
-	'UI:ListConfigurationTitle' => 'List Configuration~~',
-	'UI:ColumnsAndSortOrder' => 'Columns and sort order:~~',
-	'UI:UseDefaultSettings' => 'Use the Default Settings~~',
-	'UI:UseSpecificSettings' => 'Use the Following Settings:~~',
-	'UI:Display_X_ItemsPerPage' => 'Display %1$s items per page~~',
-	'UI:UseSavetheSettings' => 'Save the Settings~~',
-	'UI:OnlyForThisList' => 'Only for this list~~',
-	'UI:ForAllLists' => 'Default for all lists~~',
-	'UI:ExtKey_AsLink' => '%1$s (Link)~~',
-	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)~~',
-	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)~~',
-	'UI:Button:MoveUp' => 'Move Up~~',
-	'UI:Button:MoveDown' => 'Move Down~~',
-	'UI:OQL:UnknownClassAndFix' => 'Unknown class \"%1$s\". You may try \"%2$s\" instead.~~',
-	'UI:OQL:UnknownClassNoFix' => 'Unknown class \"%1$s\"~~',
-	'UI:Dashboard:Edit' => 'Edit This Page...~~',
-	'UI:Dashboard:Revert' => 'Revert To Original Version...~~',
-	'UI:Dashboard:RevertConfirm' => 'Every changes made to the original version will be lost. Please confirm that you want to do this.~~',
-	'UI:ExportDashBoard' => 'Export to a file~~',
-	'UI:ImportDashBoard' => 'Import from a file...~~',
-	'UI:ImportDashboardTitle' => 'Import From a File~~',
-	'UI:ImportDashboardText' => 'Select a dashboard file to import:~~',
-	'UI:DashletCreation:Title' => 'Create a new Dashlet~~',
-	'UI:DashletCreation:Dashboard' => 'Dashboard~~',
-	'UI:DashletCreation:DashletType' => 'Dashlet Type~~',
-	'UI:DashletCreation:EditNow' => 'Edit the Dashboard~~',
-	'UI:DashboardEdit:Title' => 'Dashboard Editor~~',
-	'UI:DashboardEdit:DashboardTitle' => 'Title~~',
-	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
-	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~',
-	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
-	'UI:DashboardEdit:Layout' => 'Layout~~',
-	'UI:DashboardEdit:Properties' => 'Dashboard Properties~~',
-	'UI:DashboardEdit:Dashlets' => 'Available Dashlets~~',
-	'UI:DashboardEdit:DashletProperties' => 'Dashlet Properties~~',
-	'UI:Form:Property' => 'Property~~',
-	'UI:Form:Value' => 'Value~~',
-	'UI:DashletPlainText:Label' => 'Text~~',
-	'UI:DashletPlainText:Description' => 'Plain text (no formatting)~~',
-	'UI:DashletPlainText:Prop-Text' => 'Text~~',
-	'UI:DashletPlainText:Prop-Text:Default' => 'Please enter some text here...~~',
-	'UI:DashletObjectList:Label' => 'Object list~~',
-	'UI:DashletObjectList:Description' => 'Object list dashlet~~',
-	'UI:DashletObjectList:Prop-Title' => 'Title~~',
-	'UI:DashletObjectList:Prop-Query' => 'Query~~',
-	'UI:DashletObjectList:Prop-Menu' => 'Menu~~',
-	'UI:DashletGroupBy:Prop-Title' => 'Title~~',
-	'UI:DashletGroupBy:Prop-Query' => 'Query~~',
-	'UI:DashletGroupBy:Prop-Style' => 'Style~~',
-	'UI:DashletGroupBy:Prop-GroupBy' => 'Group by...~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Hour of %1$s (0-23)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Month of %1$s (1 - 12)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Day of week for %1$s~~',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Day of month for %1$s~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (hour)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (month)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (day of week)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (day of month)~~',
-	'UI:DashletGroupBy:MissingGroupBy' => 'Please select the field on which the objects will be grouped together~~',
-	'UI:DashletGroupByPie:Label' => 'Pie Chart~~',
-	'UI:DashletGroupByPie:Description' => 'Pie Chart~~',
-	'UI:DashletGroupByBars:Label' => 'Bar Chart~~',
-	'UI:DashletGroupByBars:Description' => 'Bar Chart~~',
-	'UI:DashletGroupByTable:Label' => 'Group By (table)~~',
-	'UI:DashletGroupByTable:Description' => 'List (Grouped by a field)~~',
-	'UI:DashletHeaderStatic:Label' => 'Header~~',
-	'UI:DashletHeaderStatic:Description' => 'Displays an horizontal separator~~',
-	'UI:DashletHeaderStatic:Prop-Title' => 'Title~~',
-	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacts~~',
-	'UI:DashletHeaderStatic:Prop-Icon' => 'Icon~~',
-	'UI:DashletHeaderDynamic:Label' => 'Header with statistics~~',
-	'UI:DashletHeaderDynamic:Description' => 'Header with stats (grouped by...)~~',
-	'UI:DashletHeaderDynamic:Prop-Title' => 'Title~~',
-	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contacts~~',
-	'UI:DashletHeaderDynamic:Prop-Icon' => 'Icon~~',
-	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Subtitle~~',
-	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contacts~~',
-	'UI:DashletHeaderDynamic:Prop-Query' => 'Query~~',
-	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Group by~~',
-	'UI:DashletHeaderDynamic:Prop-Values' => 'Values~~',
-	'UI:DashletBadge:Label' => 'Badge~~',
-	'UI:DashletBadge:Description' => 'Object Icon with new/search~~',
-	'UI:DashletBadge:Prop-Class' => 'Class~~',
-	'DayOfWeek-Sunday' => 'Sunday~~',
-	'DayOfWeek-Monday' => 'Monday~~',
-	'DayOfWeek-Tuesday' => 'Tuesday~~',
-	'DayOfWeek-Wednesday' => 'Wednesday~~',
-	'DayOfWeek-Thursday' => 'Thursday~~',
-	'DayOfWeek-Friday' => 'Friday~~',
-	'DayOfWeek-Saturday' => 'Saturday~~',
-	'Month-01' => 'January~~',
-	'Month-02' => 'February~~',
-	'Month-03' => 'March~~',
-	'Month-04' => 'April~~',
-	'Month-05' => 'May~~',
-	'Month-06' => 'June~~',
-	'Month-07' => 'July~~',
-	'Month-08' => 'August~~',
-	'Month-09' => 'September~~',
-	'Month-10' => 'October~~',
-	'Month-11' => 'November~~',
-	'Month-12' => 'December~~',
-	'DayOfWeek-Sunday-Min' => 'Su~~',
-	'DayOfWeek-Monday-Min' => 'Mo~~',
-	'DayOfWeek-Tuesday-Min' => 'Tu~~',
-	'DayOfWeek-Wednesday-Min' => 'We~~',
-	'DayOfWeek-Thursday-Min' => 'Th~~',
-	'DayOfWeek-Friday-Min' => 'Fr~~',
-	'DayOfWeek-Saturday-Min' => 'Sa~~',
-	'Month-01-Short' => 'Jan~~',
-	'Month-02-Short' => 'Feb~~',
-	'Month-03-Short' => 'Mar~~',
-	'Month-04-Short' => 'Apr~~',
-	'Month-05-Short' => 'May~~',
-	'Month-06-Short' => 'Jun~~',
-	'Month-07-Short' => 'Jul~~',
-	'Month-08-Short' => 'Aug~~',
-	'Month-09-Short' => 'Sep~~',
-	'Month-10-Short' => 'Oct~~',
-	'Month-11-Short' => 'Nov~~',
-	'Month-12-Short' => 'Dec~~',
-	'Calendar-FirstDayOfWeek' => '0~~',
-	'UI:Menu:ShortcutList' => 'Create a Shortcut...~~',
-	'UI:ShortcutRenameDlg:Title' => 'Rename the shortcut~~',
-	'UI:ShortcutListDlg:Title' => 'Create a shortcut for the list~~',
-	'UI:ShortcutDelete:Confirm' => 'Please confirm that wou wish to delete the shortcut(s).~~',
-	'Menu:MyShortcuts' => 'My Shortcuts~~',
-	'Class:Shortcut' => 'Shortcut~~',
-	'Class:Shortcut/Attribute:name' => 'Name~~',
-	'Class:Shortcut/Attribute:name+' => 'Label used in the menu and page title~~',
-	'Class:ShortcutOQL' => 'Search result shortcut~~',
-	'Class:ShortcutOQL/Attribute:oql' => 'Query~~',
-	'Class:ShortcutOQL/Attribute:oql+' => 'OQL defining the list of objects to search for~~',
-	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh~~',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled~~',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
-	'UI:FillAllMandatoryFields' => 'Please fill all mandatory fields.~~',
-	'UI:ValueMustBeSet' => 'Please specify a value~~',
-	'UI:ValueMustBeChanged' => 'Please change the value~~',
-	'UI:ValueInvalidFormat' => 'Invalid format~~',
-	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
-	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
-	'UI:CSVImportError_items' => 'Errors: %1$d~~',
-	'UI:CSVImportCreated_items' => 'Created: %1$d~~',
-	'UI:CSVImportModified_items' => 'Modified: %1$d~~',
-	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d~~',
-	'UI:Button:Remove' => 'Remove~~',
-	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
-	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
-	'UI:AboutBox' => 'About iTop...~~',
-	'UI:About:Title' => 'About iTop~~',
-	'UI:About:DataModel' => 'Data model~~',
-	'UI:About:Support' => 'Support information~~',
-	'UI:About:Licenses' => 'Licenses~~',
-	'UI:About:Modules' => 'Installed modules~~',
-	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
-	'UI:DisconnectedDlgTitle' => 'Warning!~~',
-	'UI:LoginAgain' => 'Login again~~',
-	'UI:StayOnThePage' => 'Stay on this page~~',
-	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
-	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
-	'ExcelExporter:ExportButton' => 'Export~~',
-	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
-	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
-	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
-	'ExcelExporter:Done' => 'Done.~~',
-	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
-	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
-	'ExcelExport:Statistics' => 'Statistics~~',
-	'portal:legacy_portal' => 'End-User Portal~~',
-	'portal:backoffice' => 'iTop Back-Office User Interface~~',
-	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
-	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
-	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
-	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
-	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
-	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
-	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
+	'Class:Query' => 'Query~~',
+	'Class:Query+' => 'A query is a data set defined in a dynamic way~~',
+	'Class:Query/Attribute:name' => 'Name~~',
+	'Class:Query/Attribute:name+' => 'Identifies the query~~',
+	'Class:Query/Attribute:description' => 'Description~~',
+	'Class:Query/Attribute:description+' => 'Long description for the query (purpose, usage, etc.)~~',
+	'Class:Query/Attribute:fields' => 'Fields~~',
+	'Class:Query/Attribute:fields+' => 'Coma separated list of attributes (or alias.attribute) to export~~',
+	'Class:QueryOQL' => 'OQL Query~~',
+	'Class:QueryOQL+' => 'A query based on the Object Query Language~~',
+	'Class:QueryOQL/Attribute:oql' => 'Expression~~',
+	'Class:QueryOQL/Attribute:oql+' => 'OQL Expression~~',
+	'Class:UserInternal' => 'User Internal~~',
+	'Class:UserInternal+' => 'User defined within iTop~~',
+	'UI:Button:Save' => 'Save~~',
+	'UI:Button:Restart' => ' |<< Restart ~~',
+	'UI:Button:Rename' => ' Rename... ~~',
+	'UI:History:BulkImports' => 'History~~',
+	'UI:History:BulkImports+' => 'List of CSV imports (latest import first)~~',
+	'UI:History:BulkImportDetails' => 'Changes resulting from the CSV import performed on %1$s (by %2$s)~~',
+	'UI:History:StatsCreations' => 'Created~~',
+	'UI:History:StatsCreations+' => 'Count of objects created~~',
+	'UI:History:StatsModifs' => 'Modified~~',
+	'UI:History:StatsModifs+' => 'Count of objects modified~~',
+	'UI:History:StatsDeletes' => 'Deleted~~',
+	'UI:History:StatsDeletes+' => 'Count of objects deleted~~',
+	'UI:SplitDateTime-Date' => 'date~~',
+	'UI:SplitDateTime-Time' => 'time~~',
+	'UI:SearchValue:NbSelected' => '# selected~~',
+	'UI:SearchValue:CheckAll' => 'Check All~~',
+	'UI:SearchValue:UncheckAll' => 'Uncheck All~~',
+	'UI:Login:ForgotPwd' => 'Forgot your password?~~',
+	'UI:Login:ForgotPwdForm' => 'Forgot your password~~',
+	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.~~',
+	'UI:Login:ResetPassword' => 'Send now!~~',
+	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
+	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
+	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
+	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
+	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
+	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
+	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
+	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
+	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...~~',
+	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
+	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href=\"%1$s\">enter a new password</a></p>.~~',
+	'UI:ResetPwd-Title' => 'Reset password~~',
+	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
+	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
+	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
+	'UI:ResetPwd-Login' => 'Click here to login...~~',
+	'UI:Login:PasswordChanged' => 'Password successfully set!~~',
+	'UI:AccessRO-All' => 'iTop is read-only~~',
+	'UI:AccessRO-Users' => 'iTop is read-only for end-users~~',
+	'UI:ApplicationEnvironment' => 'Application environment: %1$s~~',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronization of %1$d objects of class %2$s~~',
+	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
+	'UI:CSVReport-Value-Modified' => 'Modified~~',
+	'UI:CSVReport-Value-SetIssue' => 'Could not be changed - reason: %1$s~~',
+	'UI:CSVReport-Value-ChangeIssue' => 'Could not be changed to %1$s - reason: %2$s~~',
+	'UI:CSVReport-Value-NoMatch' => 'No match~~',
+	'UI:CSVReport-Value-Missing' => 'Missing mandatory value~~',
+	'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects~~',
+	'UI:CSVReport-Row-Unchanged' => 'unchanged~~',
+	'UI:CSVReport-Row-Created' => 'created~~',
+	'UI:CSVReport-Row-Updated' => 'updated %1$d cols~~',
+	'UI:CSVReport-Row-Disappeared' => 'disappeared, changed %1$d cols~~',
+	'UI:CSVReport-Row-Issue' => 'Issue: %1$s~~',
+	'UI:CSVReport-Value-Issue-Null' => 'Null not allowed~~',
+	'UI:CSVReport-Value-Issue-NotFound' => 'Object not found~~',
+	'UI:CSVReport-Value-Issue-FoundMany' => 'Found %1$d matches~~',
+	'UI:CSVReport-Value-Issue-Readonly' => 'The attribute \'%1$s\' is read-only and cannot be modified (current value: %2$s, proposed value: %3$s)~~',
+	'UI:CSVReport-Value-Issue-Format' => 'Failed to process input: %1$s~~',
+	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling~~',
+	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s~~',
+	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributes not consistent with each others: %1$s~~',
+	'UI:CSVReport-Row-Issue-Attribute' => 'Unexpected attribute value(s)~~',
+	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Could not be created, due to missing external key(s): %1$s~~',
+	'UI:CSVReport-Row-Issue-DateFormat' => 'wrong date format~~',
+	'UI:CSVReport-Row-Issue-Reconciliation' => 'failed to reconcile~~',
+	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation~~',
+	'UI:CSVReport-Row-Issue-Internal' => 'Internal error: %1$s, %2$s~~',
+	'UI:CSVReport-Icon-Unchanged' => 'Unchanged~~',
+	'UI:CSVReport-Icon-Modified' => 'Modified~~',
+	'UI:CSVReport-Icon-Missing' => 'Missing~~',
+	'UI:CSVReport-Object-MissingToUpdate' => 'Missing object: will be updated~~',
+	'UI:CSVReport-Object-MissingUpdated' => 'Missing object: updated~~',
+	'UI:CSVReport-Icon-Created' => 'Created~~',
+	'UI:CSVReport-Object-ToCreate' => 'Object will be created~~',
+	'UI:CSVReport-Object-Created' => 'Object created~~',
+	'UI:CSVReport-Icon-Error' => 'Error~~',
+	'UI:CSVReport-Object-Error' => 'ERROR: %1$s~~',
+	'UI:CSVReport-Object-Ambiguous' => 'AMBIGUOUS: %1$s~~',
+	'UI:CSVReport-Stats-Errors' => '%1$.0f %% of the loaded objects have errors and will be ignored.~~',
+	'UI:CSVReport-Stats-Created' => '%1$.0f %% of the loaded objects will be created.~~',
+	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of the loaded objects will be modified.~~',
+	'UI:CSVExport:AdvancedMode' => 'Advanced mode~~',
+	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.~~',
+	'UI:CSVExport:LostChars' => 'Encoding issue~~',
+	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').~~',
+	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in the Rule %1$s: %2$s.~~',
+	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in the Category %1$s: %2$s.~~',
+	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries~~',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
+	'UI:Edit:TestQuery' => 'Test query~~',
+	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'This object could not be deleted because some manual operations must be performed prior to that~~',
+	'UI:Delete:Deleted' => 'deleted~~',
+	'UI:Delete:CannotDeleteBecause' => 'Could not be deleted: %1$s~~',
+	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Should be automaticaly deleted, but this is not feasible: %1$s~~',
+	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Must be deleted manually, but this is not feasible: %1$s~~',
+	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
+	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
+	'UI:Search:Enlarge' => 'Broaden the search~~',
+	'Menu:QueryMenu' => 'Query phrasebook~~',
+	'Menu:QueryMenu+' => 'Query phrasebook~~',
+	'UI:Download-CSV' => 'Download %1$s~~',
+	'UI:RelationGroups' => 'Groups~~',
+	'UI:OperationCancelled' => 'Operation Cancelled~~',
+	'UI:ElementsDisplayed' => 'Filtering~~',
+	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
+	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
+	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
+	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
+	'UI:Relation:NoneSelected' => 'None~~',
+	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
+	'UI:Relation:DrillDown' => 'Details...~~',
+	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
+	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
+	'UI:RelationOption:Untitled' => 'Untitled~~',
+	'UI:Relation:Key' => 'Key~~',
+	'UI:Relation:Comments' => 'Comments~~',
+	'UI:RelationOption:Title' => 'Title~~',
+	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
+	'UI:RelationOption:Comments' => 'Comments~~',
+	'UI:Button:Export' => 'Export~~',
+	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
+	'UI:PageFormat_A3' => 'A3~~',
+	'UI:PageFormat_A4' => 'A4~~',
+	'UI:PageFormat_Letter' => 'Letter~~',
+	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
+	'UI:PageOrientation_Portrait' => 'Portrait~~',
+	'UI:PageOrientation_Landscape' => 'Landscape~~',
+	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
+	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
+	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
+	'Portal:NoRequestMgmt' => 'Dear %1$s, you have been redirected to this page because your account is configured with the profile \'Portal user\'. Unfortunately, iTop has not been installed with the feature \'Request Management\'. Please contact your administrator.~~',
+	'Portal:TitleDetailsFor_Request' => 'Details for request~~',
+	'Portal:Attachments' => 'Attachments~~',
+	'Portal:AddAttachment' => ' Add Attachment ~~',
+	'Portal:RemoveAttachment' => ' Remove Attachment ~~',
+	'Portal:Attachment_No_To_Ticket_Name' => 'Attachment #%1$d to %2$s (%3$s)~~',
+	'Portal:SelectRequestTemplate' => 'Select a template for %1$s~~',
+	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Days %2$s Hours %3$s Minutes %4$s Seconds~~',
+	'UI:ModifyAllPageTitle' => 'Modify All~~',
+	'UI:Modify_N_ObjectsOf_Class' => 'Modifying %1$d objects of class %2$s~~',
+	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifying %1$d objects of class %2$s out of %3$d~~',
+	'UI:Menu:ModifyAll' => 'Modify...~~',
+	'UI:Button:ModifyAll' => 'Modify All~~',
+	'UI:Button:PreviewModifications' => 'Preview Modifications >>~~',
+	'UI:ModifiedObject' => 'Object Modified~~',
+	'UI:BulkModifyStatus' => 'Operation~~',
+	'UI:BulkModifyStatus+' => 'Status of the operation~~',
+	'UI:BulkModifyErrors' => 'Errors (if any)~~',
+	'UI:BulkModifyErrors+' => 'Errors preventing the modification~~',
+	'UI:BulkModifyStatusOk' => 'Ok~~',
+	'UI:BulkModifyStatusError' => 'Error~~',
+	'UI:BulkModifyStatusModified' => 'Modified~~',
+	'UI:BulkModifyStatusSkipped' => 'Skipped~~',
+	'UI:BulkModify_Count_DistinctValues' => '%1$d distinct values:~~',
+	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d time(s)~~',
+	'UI:BulkModify:N_MoreValues' => '%1$d more values...~~',
+	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Attempting to set the read-only field: %1$s~~',
+	'UI:FailedToApplyStimuli' => 'The action has failed.~~',
+	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Modifying %2$d objects of class %3$s~~',
+	'UI:CaseLogTypeYourTextHere' => 'Type your text here:~~',
+	'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.~~',
+	'UI:Pagination:HeaderSelection' => 'Total: %1$s objects (%2$s objects selected).~~',
+	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objects.~~',
+	'UI:Pagination:PageSize' => '%1$s objects per page~~',
+	'UI:Pagination:PagesLabel' => 'Pages:~~',
+	'UI:Pagination:All' => 'All~~',
+	'UI:HierarchyOf_Class' => 'Hierarchy of %1$s~~',
+	'UI:Preferences' => 'Preferences...~~',
+	'UI:FavoriteOrganizations' => 'Favorite Organizations~~',
+	'UI:FavoriteOrganizations+' => 'Check in the list below the organizations that you want to see in the drop-down menu for a quick access. Note that this is not a security setting, objects from any organization are still visible and can be accessed by selecting \"All Organizations\" in the drop-down list.~~',
+	'UI:FavoriteLanguage' => 'Language of the User Interface~~',
+	'UI:Favorites:SelectYourLanguage' => 'Select your preferred language~~',
+	'UI:FavoriteOtherSettings' => 'Other Settings~~',
+	'UI:Favorites:Default_X_ItemsPerPage' => 'Default length for lists:  %1$s items per page~~',
+	'UI:NavigateAwayConfirmationMessage' => 'Any modification will be discarded.~~',
+	'UI:CancelConfirmationMessage' => 'You will loose your changes. Continue anyway?~~',
+	'UI:AutoApplyConfirmationMessage' => 'Some changes have not been applied yet. Do you want itop to take them into account?~~',
+	'UI:Create_Class_InState' => 'Create the %1$s in state: ~~',
+	'UI:OrderByHint_Values' => 'Sort order: %1$s~~',
+	'UI:Menu:AddToDashboard' => 'Add To Dashboard...~~',
+	'UI:ConfigureThisList' => 'Configure This List...~~',
+	'UI:ListConfigurationTitle' => 'List Configuration~~',
+	'UI:ColumnsAndSortOrder' => 'Columns and sort order:~~',
+	'UI:UseDefaultSettings' => 'Use the Default Settings~~',
+	'UI:UseSpecificSettings' => 'Use the Following Settings:~~',
+	'UI:Display_X_ItemsPerPage' => 'Display %1$s items per page~~',
+	'UI:UseSavetheSettings' => 'Save the Settings~~',
+	'UI:OnlyForThisList' => 'Only for this list~~',
+	'UI:ForAllLists' => 'Default for all lists~~',
+	'UI:ExtKey_AsLink' => '%1$s (Link)~~',
+	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)~~',
+	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)~~',
+	'UI:Button:MoveUp' => 'Move Up~~',
+	'UI:Button:MoveDown' => 'Move Down~~',
+	'UI:OQL:UnknownClassAndFix' => 'Unknown class \"%1$s\". You may try \"%2$s\" instead.~~',
+	'UI:OQL:UnknownClassNoFix' => 'Unknown class \"%1$s\"~~',
+	'UI:Dashboard:Edit' => 'Edit This Page...~~',
+	'UI:Dashboard:Revert' => 'Revert To Original Version...~~',
+	'UI:Dashboard:RevertConfirm' => 'Every changes made to the original version will be lost. Please confirm that you want to do this.~~',
+	'UI:ExportDashBoard' => 'Export to a file~~',
+	'UI:ImportDashBoard' => 'Import from a file...~~',
+	'UI:ImportDashboardTitle' => 'Import From a File~~',
+	'UI:ImportDashboardText' => 'Select a dashboard file to import:~~',
+	'UI:DashletCreation:Title' => 'Create a new Dashlet~~',
+	'UI:DashletCreation:Dashboard' => 'Dashboard~~',
+	'UI:DashletCreation:DashletType' => 'Dashlet Type~~',
+	'UI:DashletCreation:EditNow' => 'Edit the Dashboard~~',
+	'UI:DashboardEdit:Title' => 'Dashboard Editor~~',
+	'UI:DashboardEdit:DashboardTitle' => 'Title~~',
+	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
+	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~',
+	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
+	'UI:DashboardEdit:Layout' => 'Layout~~',
+	'UI:DashboardEdit:Properties' => 'Dashboard Properties~~',
+	'UI:DashboardEdit:Dashlets' => 'Available Dashlets~~',
+	'UI:DashboardEdit:DashletProperties' => 'Dashlet Properties~~',
+	'UI:Form:Property' => 'Property~~',
+	'UI:Form:Value' => 'Value~~',
+	'UI:DashletPlainText:Label' => 'Text~~',
+	'UI:DashletPlainText:Description' => 'Plain text (no formatting)~~',
+	'UI:DashletPlainText:Prop-Text' => 'Text~~',
+	'UI:DashletPlainText:Prop-Text:Default' => 'Please enter some text here...~~',
+	'UI:DashletObjectList:Label' => 'Object list~~',
+	'UI:DashletObjectList:Description' => 'Object list dashlet~~',
+	'UI:DashletObjectList:Prop-Title' => 'Title~~',
+	'UI:DashletObjectList:Prop-Query' => 'Query~~',
+	'UI:DashletObjectList:Prop-Menu' => 'Menu~~',
+	'UI:DashletGroupBy:Prop-Title' => 'Title~~',
+	'UI:DashletGroupBy:Prop-Query' => 'Query~~',
+	'UI:DashletGroupBy:Prop-Style' => 'Style~~',
+	'UI:DashletGroupBy:Prop-GroupBy' => 'Group by...~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Hour of %1$s (0-23)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Month of %1$s (1 - 12)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Day of week for %1$s~~',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Day of month for %1$s~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (hour)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (month)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (day of week)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (day of month)~~',
+	'UI:DashletGroupBy:MissingGroupBy' => 'Please select the field on which the objects will be grouped together~~',
+	'UI:DashletGroupByPie:Label' => 'Pie Chart~~',
+	'UI:DashletGroupByPie:Description' => 'Pie Chart~~',
+	'UI:DashletGroupByBars:Label' => 'Bar Chart~~',
+	'UI:DashletGroupByBars:Description' => 'Bar Chart~~',
+	'UI:DashletGroupByTable:Label' => 'Group By (table)~~',
+	'UI:DashletGroupByTable:Description' => 'List (Grouped by a field)~~',
+	'UI:DashletHeaderStatic:Label' => 'Header~~',
+	'UI:DashletHeaderStatic:Description' => 'Displays an horizontal separator~~',
+	'UI:DashletHeaderStatic:Prop-Title' => 'Title~~',
+	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacts~~',
+	'UI:DashletHeaderStatic:Prop-Icon' => 'Icon~~',
+	'UI:DashletHeaderDynamic:Label' => 'Header with statistics~~',
+	'UI:DashletHeaderDynamic:Description' => 'Header with stats (grouped by...)~~',
+	'UI:DashletHeaderDynamic:Prop-Title' => 'Title~~',
+	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contacts~~',
+	'UI:DashletHeaderDynamic:Prop-Icon' => 'Icon~~',
+	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Subtitle~~',
+	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contacts~~',
+	'UI:DashletHeaderDynamic:Prop-Query' => 'Query~~',
+	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Group by~~',
+	'UI:DashletHeaderDynamic:Prop-Values' => 'Values~~',
+	'UI:DashletBadge:Label' => 'Badge~~',
+	'UI:DashletBadge:Description' => 'Object Icon with new/search~~',
+	'UI:DashletBadge:Prop-Class' => 'Class~~',
+	'DayOfWeek-Sunday' => 'Sunday~~',
+	'DayOfWeek-Monday' => 'Monday~~',
+	'DayOfWeek-Tuesday' => 'Tuesday~~',
+	'DayOfWeek-Wednesday' => 'Wednesday~~',
+	'DayOfWeek-Thursday' => 'Thursday~~',
+	'DayOfWeek-Friday' => 'Friday~~',
+	'DayOfWeek-Saturday' => 'Saturday~~',
+	'Month-01' => 'January~~',
+	'Month-02' => 'February~~',
+	'Month-03' => 'March~~',
+	'Month-04' => 'April~~',
+	'Month-05' => 'May~~',
+	'Month-06' => 'June~~',
+	'Month-07' => 'July~~',
+	'Month-08' => 'August~~',
+	'Month-09' => 'September~~',
+	'Month-10' => 'October~~',
+	'Month-11' => 'November~~',
+	'Month-12' => 'December~~',
+	'DayOfWeek-Sunday-Min' => 'Su~~',
+	'DayOfWeek-Monday-Min' => 'Mo~~',
+	'DayOfWeek-Tuesday-Min' => 'Tu~~',
+	'DayOfWeek-Wednesday-Min' => 'We~~',
+	'DayOfWeek-Thursday-Min' => 'Th~~',
+	'DayOfWeek-Friday-Min' => 'Fr~~',
+	'DayOfWeek-Saturday-Min' => 'Sa~~',
+	'Month-01-Short' => 'Jan~~',
+	'Month-02-Short' => 'Feb~~',
+	'Month-03-Short' => 'Mar~~',
+	'Month-04-Short' => 'Apr~~',
+	'Month-05-Short' => 'May~~',
+	'Month-06-Short' => 'Jun~~',
+	'Month-07-Short' => 'Jul~~',
+	'Month-08-Short' => 'Aug~~',
+	'Month-09-Short' => 'Sep~~',
+	'Month-10-Short' => 'Oct~~',
+	'Month-11-Short' => 'Nov~~',
+	'Month-12-Short' => 'Dec~~',
+	'Calendar-FirstDayOfWeek' => '0~~',
+	'UI:Menu:ShortcutList' => 'Create a Shortcut...~~',
+	'UI:ShortcutRenameDlg:Title' => 'Rename the shortcut~~',
+	'UI:ShortcutListDlg:Title' => 'Create a shortcut for the list~~',
+	'UI:ShortcutDelete:Confirm' => 'Please confirm that wou wish to delete the shortcut(s).~~',
+	'Menu:MyShortcuts' => 'My Shortcuts~~',
+	'Class:Shortcut' => 'Shortcut~~',
+	'Class:Shortcut/Attribute:name' => 'Name~~',
+	'Class:Shortcut/Attribute:name+' => 'Label used in the menu and page title~~',
+	'Class:ShortcutOQL' => 'Search result shortcut~~',
+	'Class:ShortcutOQL/Attribute:oql' => 'Query~~',
+	'Class:ShortcutOQL/Attribute:oql+' => 'OQL defining the list of objects to search for~~',
+	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh~~',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled~~',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
+	'UI:FillAllMandatoryFields' => 'Please fill all mandatory fields.~~',
+	'UI:ValueMustBeSet' => 'Please specify a value~~',
+	'UI:ValueMustBeChanged' => 'Please change the value~~',
+	'UI:ValueInvalidFormat' => 'Invalid format~~',
+	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
+	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
+	'UI:CSVImportError_items' => 'Errors: %1$d~~',
+	'UI:CSVImportCreated_items' => 'Created: %1$d~~',
+	'UI:CSVImportModified_items' => 'Modified: %1$d~~',
+	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d~~',
+	'UI:Button:Remove' => 'Remove~~',
+	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
+	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
+	'UI:AboutBox' => 'About iTop...~~',
+	'UI:About:Title' => 'About iTop~~',
+	'UI:About:DataModel' => 'Data model~~',
+	'UI:About:Support' => 'Support information~~',
+	'UI:About:Licenses' => 'Licenses~~',
+	'UI:About:Modules' => 'Installed modules~~',
+	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
+	'UI:DisconnectedDlgTitle' => 'Warning!~~',
+	'UI:LoginAgain' => 'Login again~~',
+	'UI:StayOnThePage' => 'Stay on this page~~',
+	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
+	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
+	'ExcelExporter:ExportButton' => 'Export~~',
+	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
+	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
+	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
+	'ExcelExporter:Done' => 'Done.~~',
+	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
+	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
+	'ExcelExport:Statistics' => 'Statistics~~',
+	'portal:legacy_portal' => 'End-User Portal~~',
+	'portal:backoffice' => 'iTop Back-Office User Interface~~',
+	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
+	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
+	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
+	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
+	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
+	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
+	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
 ));
 
 

+ 383 - 382
dictionaries/zh.dictionary.itop.ui.php

@@ -864,388 +864,389 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	
 	'Enum:Undefined' => '未定义',
 	'UI:Button:Refresh' => '刷新',
-	'Class:Query' => 'Query~~',
-	'Class:Query+' => 'A query is a data set defined in a dynamic way~~',
-	'Class:Query/Attribute:name' => 'Name~~',
-	'Class:Query/Attribute:name+' => 'Identifies the query~~',
-	'Class:Query/Attribute:description' => 'Description~~',
-	'Class:Query/Attribute:description+' => 'Long description for the query (purpose, usage, etc.)~~',
-	'Class:Query/Attribute:fields' => 'Fields~~',
-	'Class:Query/Attribute:fields+' => 'Coma separated list of attributes (or alias.attribute) to export~~',
-	'Class:QueryOQL' => 'OQL Query~~',
-	'Class:QueryOQL+' => 'A query based on the Object Query Language~~',
-	'Class:QueryOQL/Attribute:oql' => 'Expression~~',
-	'Class:QueryOQL/Attribute:oql+' => 'OQL Expression~~',
-	'Class:UserInternal' => 'User Internal~~',
-	'Class:UserInternal+' => 'User defined within iTop~~',
-	'UI:Button:Save' => 'Save~~',
-	'UI:Button:Restart' => ' |<< Restart ~~',
-	'UI:Button:Rename' => ' Rename... ~~',
-	'UI:History:BulkImports' => 'History~~',
-	'UI:History:BulkImports+' => 'List of CSV imports (latest import first)~~',
-	'UI:History:BulkImportDetails' => 'Changes resulting from the CSV import performed on %1$s (by %2$s)~~',
-	'UI:History:StatsCreations' => 'Created~~',
-	'UI:History:StatsCreations+' => 'Count of objects created~~',
-	'UI:History:StatsModifs' => 'Modified~~',
-	'UI:History:StatsModifs+' => 'Count of objects modified~~',
-	'UI:History:StatsDeletes' => 'Deleted~~',
-	'UI:History:StatsDeletes+' => 'Count of objects deleted~~',
-	'UI:SplitDateTime-Date' => 'date~~',
-	'UI:SplitDateTime-Time' => 'time~~',
-	'UI:SearchValue:NbSelected' => '# selected~~',
-	'UI:SearchValue:CheckAll' => 'Check All~~',
-	'UI:SearchValue:UncheckAll' => 'Uncheck All~~',
-	'UI:Login:ForgotPwd' => 'Forgot your password?~~',
-	'UI:Login:ForgotPwdForm' => 'Forgot your password~~',
-	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.~~',
-	'UI:Login:ResetPassword' => 'Send now!~~',
-	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
-	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
-	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
-	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
-	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
-	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
-	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...~~',
-	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
-	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href=\"%1$s\">enter a new password</a></p>.~~',
-	'UI:ResetPwd-Title' => 'Reset password~~',
-	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
-	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
-	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
-	'UI:ResetPwd-Login' => 'Click here to login...~~',
-	'UI:Login:PasswordChanged' => 'Password successfully set!~~',
-	'UI:AccessRO-All' => 'iTop is read-only~~',
-	'UI:AccessRO-Users' => 'iTop is read-only for end-users~~',
-	'UI:ApplicationEnvironment' => 'Application environment: %1$s~~',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronization of %1$d objects of class %2$s~~',
-	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
-	'UI:CSVReport-Value-Modified' => 'Modified~~',
-	'UI:CSVReport-Value-SetIssue' => 'Could not be changed - reason: %1$s~~',
-	'UI:CSVReport-Value-ChangeIssue' => 'Could not be changed to %1$s - reason: %2$s~~',
-	'UI:CSVReport-Value-NoMatch' => 'No match~~',
-	'UI:CSVReport-Value-Missing' => 'Missing mandatory value~~',
-	'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects~~',
-	'UI:CSVReport-Row-Unchanged' => 'unchanged~~',
-	'UI:CSVReport-Row-Created' => 'created~~',
-	'UI:CSVReport-Row-Updated' => 'updated %1$d cols~~',
-	'UI:CSVReport-Row-Disappeared' => 'disappeared, changed %1$d cols~~',
-	'UI:CSVReport-Row-Issue' => 'Issue: %1$s~~',
-	'UI:CSVReport-Value-Issue-Null' => 'Null not allowed~~',
-	'UI:CSVReport-Value-Issue-NotFound' => 'Object not found~~',
-	'UI:CSVReport-Value-Issue-FoundMany' => 'Found %1$d matches~~',
-	'UI:CSVReport-Value-Issue-Readonly' => 'The attribute \'%1$s\' is read-only and cannot be modified (current value: %2$s, proposed value: %3$s)~~',
-	'UI:CSVReport-Value-Issue-Format' => 'Failed to process input: %1$s~~',
-	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling~~',
-	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s~~',
-	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributes not consistent with each others: %1$s~~',
-	'UI:CSVReport-Row-Issue-Attribute' => 'Unexpected attribute value(s)~~',
-	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Could not be created, due to missing external key(s): %1$s~~',
-	'UI:CSVReport-Row-Issue-DateFormat' => 'wrong date format~~',
-	'UI:CSVReport-Row-Issue-Reconciliation' => 'failed to reconcile~~',
-	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation~~',
-	'UI:CSVReport-Row-Issue-Internal' => 'Internal error: %1$s, %2$s~~',
-	'UI:CSVReport-Icon-Unchanged' => 'Unchanged~~',
-	'UI:CSVReport-Icon-Modified' => 'Modified~~',
-	'UI:CSVReport-Icon-Missing' => 'Missing~~',
-	'UI:CSVReport-Object-MissingToUpdate' => 'Missing object: will be updated~~',
-	'UI:CSVReport-Object-MissingUpdated' => 'Missing object: updated~~',
-	'UI:CSVReport-Icon-Created' => 'Created~~',
-	'UI:CSVReport-Object-ToCreate' => 'Object will be created~~',
-	'UI:CSVReport-Object-Created' => 'Object created~~',
-	'UI:CSVReport-Icon-Error' => 'Error~~',
-	'UI:CSVReport-Object-Error' => 'ERROR: %1$s~~',
-	'UI:CSVReport-Object-Ambiguous' => 'AMBIGUOUS: %1$s~~',
-	'UI:CSVReport-Stats-Errors' => '%1$.0f %% of the loaded objects have errors and will be ignored.~~',
-	'UI:CSVReport-Stats-Created' => '%1$.0f %% of the loaded objects will be created.~~',
-	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of the loaded objects will be modified.~~',
-	'UI:CSVExport:AdvancedMode' => 'Advanced mode~~',
-	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.~~',
-	'UI:CSVExport:LostChars' => 'Encoding issue~~',
-	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').~~',
-	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in the Rule %1$s: %2$s.~~',
-	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in the Category %1$s: %2$s.~~',
-	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries~~',
-	'UI:Edit:TestQuery' => 'Test query~~',
-	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'This object could not be deleted because some manual operations must be performed prior to that~~',
-	'UI:Delete:Deleted' => 'deleted~~',
-	'UI:Delete:CannotDeleteBecause' => 'Could not be deleted: %1$s~~',
-	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Should be automaticaly deleted, but this is not feasible: %1$s~~',
-	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Must be deleted manually, but this is not feasible: %1$s~~',
-	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
-	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
-	'UI:Search:Enlarge' => 'Broaden the search~~',
-	'Menu:QueryMenu' => 'Query phrasebook~~',
-	'Menu:QueryMenu+' => 'Query phrasebook~~',
-	'UI:Download-CSV' => 'Download %1$s~~',
-	'UI:RelationGroups' => 'Groups~~',
-	'UI:OperationCancelled' => 'Operation Cancelled~~',
-	'UI:ElementsDisplayed' => 'Filtering~~',
-	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
-	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
-	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
-	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
-	'UI:Relation:NoneSelected' => 'None~~',
-	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
-	'UI:Relation:DrillDown' => 'Details...~~',
-	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
-	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
-	'UI:RelationOption:Untitled' => 'Untitled~~',
-	'UI:Relation:Key' => 'Key~~',
-	'UI:Relation:Comments' => 'Comments~~',
-	'UI:RelationOption:Title' => 'Title~~',
-	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
-	'UI:RelationOption:Comments' => 'Comments~~',
-	'UI:Button:Export' => 'Export~~',
-	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
-	'UI:PageFormat_A3' => 'A3~~',
-	'UI:PageFormat_A4' => 'A4~~',
-	'UI:PageFormat_Letter' => 'Letter~~',
-	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
-	'UI:PageOrientation_Portrait' => 'Portrait~~',
-	'UI:PageOrientation_Landscape' => 'Landscape~~',
-	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
-	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
-	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
-	'Portal:NoRequestMgmt' => 'Dear %1$s, you have been redirected to this page because your account is configured with the profile \'Portal user\'. Unfortunately, iTop has not been installed with the feature \'Request Management\'. Please contact your administrator.~~',
-	'Portal:TitleDetailsFor_Request' => 'Details for request~~',
-	'Portal:Button:ReopenTicket' => 'Reopen this ticket~~',
-	'Portal:Attachments' => 'Attachments~~',
-	'Portal:AddAttachment' => ' Add Attachment ~~',
-	'Portal:RemoveAttachment' => ' Remove Attachment ~~',
-	'Portal:Attachment_No_To_Ticket_Name' => 'Attachment #%1$d to %2$s (%3$s)~~',
-	'Portal:SelectRequestTemplate' => 'Select a template for %1$s~~',
-	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Days %2$s Hours %3$s Minutes %4$s Seconds~~',
-	'UI:ModifyAllPageTitle' => 'Modify All~~',
-	'UI:Modify_N_ObjectsOf_Class' => 'Modifying %1$d objects of class %2$s~~',
-	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifying %1$d objects of class %2$s out of %3$d~~',
-	'UI:Menu:ModifyAll' => 'Modify...~~',
-	'UI:Button:ModifyAll' => 'Modify All~~',
-	'UI:Button:PreviewModifications' => 'Preview Modifications >>~~',
-	'UI:ModifiedObject' => 'Object Modified~~',
-	'UI:BulkModifyStatus' => 'Operation~~',
-	'UI:BulkModifyStatus+' => 'Status of the operation~~',
-	'UI:BulkModifyErrors' => 'Errors (if any)~~',
-	'UI:BulkModifyErrors+' => 'Errors preventing the modification~~',
-	'UI:BulkModifyStatusOk' => 'Ok~~',
-	'UI:BulkModifyStatusError' => 'Error~~',
-	'UI:BulkModifyStatusModified' => 'Modified~~',
-	'UI:BulkModifyStatusSkipped' => 'Skipped~~',
-	'UI:BulkModify_Count_DistinctValues' => '%1$d distinct values:~~',
-	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d time(s)~~',
-	'UI:BulkModify:N_MoreValues' => '%1$d more values...~~',
-	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Attempting to set the read-only field: %1$s~~',
-	'UI:FailedToApplyStimuli' => 'The action has failed.~~',
-	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Modifying %2$d objects of class %3$s~~',
-	'UI:CaseLogTypeYourTextHere' => 'Type your text here:~~',
-	'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.~~',
-	'UI:Pagination:HeaderSelection' => 'Total: %1$s objects (%2$s objects selected).~~',
-	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objects.~~',
-	'UI:Pagination:PageSize' => '%1$s objects per page~~',
-	'UI:Pagination:PagesLabel' => 'Pages:~~',
-	'UI:Pagination:All' => 'All~~',
-	'UI:HierarchyOf_Class' => 'Hierarchy of %1$s~~',
-	'UI:Preferences' => 'Preferences...~~',
-	'UI:FavoriteOrganizations' => 'Favorite Organizations~~',
-	'UI:FavoriteOrganizations+' => 'Check in the list below the organizations that you want to see in the drop-down menu for a quick access. Note that this is not a security setting, objects from any organization are still visible and can be accessed by selecting \"All Organizations\" in the drop-down list.~~',
-	'UI:FavoriteLanguage' => 'Language of the User Interface~~',
-	'UI:Favorites:SelectYourLanguage' => 'Select your preferred language~~',
-	'UI:FavoriteOtherSettings' => 'Other Settings~~',
-	'UI:Favorites:Default_X_ItemsPerPage' => 'Default length for lists:  %1$s items per page~~',
-	'UI:NavigateAwayConfirmationMessage' => 'Any modification will be discarded.~~',
-	'UI:CancelConfirmationMessage' => 'You will loose your changes. Continue anyway?~~',
-	'UI:AutoApplyConfirmationMessage' => 'Some changes have not been applied yet. Do you want itop to take them into account?~~',
-	'UI:Create_Class_InState' => 'Create the %1$s in state: ~~',
-	'UI:OrderByHint_Values' => 'Sort order: %1$s~~',
-	'UI:Menu:AddToDashboard' => 'Add To Dashboard...~~',
-	'UI:ConfigureThisList' => 'Configure This List...~~',
-	'UI:ListConfigurationTitle' => 'List Configuration~~',
-	'UI:ColumnsAndSortOrder' => 'Columns and sort order:~~',
-	'UI:UseDefaultSettings' => 'Use the Default Settings~~',
-	'UI:UseSpecificSettings' => 'Use the Following Settings:~~',
-	'UI:Display_X_ItemsPerPage' => 'Display %1$s items per page~~',
-	'UI:UseSavetheSettings' => 'Save the Settings~~',
-	'UI:OnlyForThisList' => 'Only for this list~~',
-	'UI:ForAllLists' => 'Default for all lists~~',
-	'UI:ExtKey_AsLink' => '%1$s (Link)~~',
-	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)~~',
-	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)~~',
-	'UI:Button:MoveUp' => 'Move Up~~',
-	'UI:Button:MoveDown' => 'Move Down~~',
-	'UI:OQL:UnknownClassAndFix' => 'Unknown class \"%1$s\". You may try \"%2$s\" instead.~~',
-	'UI:OQL:UnknownClassNoFix' => 'Unknown class \"%1$s\"~~',
-	'UI:Dashboard:Edit' => 'Edit This Page...~~',
-	'UI:Dashboard:Revert' => 'Revert To Original Version...~~',
-	'UI:Dashboard:RevertConfirm' => 'Every changes made to the original version will be lost. Please confirm that you want to do this.~~',
-	'UI:ExportDashBoard' => 'Export to a file~~',
-	'UI:ImportDashBoard' => 'Import from a file...~~',
-	'UI:ImportDashboardTitle' => 'Import From a File~~',
-	'UI:ImportDashboardText' => 'Select a dashboard file to import:~~',
-	'UI:DashletCreation:Title' => 'Create a new Dashlet~~',
-	'UI:DashletCreation:Dashboard' => 'Dashboard~~',
-	'UI:DashletCreation:DashletType' => 'Dashlet Type~~',
-	'UI:DashletCreation:EditNow' => 'Edit the Dashboard~~',
-	'UI:DashboardEdit:Title' => 'Dashboard Editor~~',
-	'UI:DashboardEdit:DashboardTitle' => 'Title~~',
-	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
-	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~',
-	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
-	'UI:DashboardEdit:Layout' => 'Layout~~',
-	'UI:DashboardEdit:Properties' => 'Dashboard Properties~~',
-	'UI:DashboardEdit:Dashlets' => 'Available Dashlets~~',
-	'UI:DashboardEdit:DashletProperties' => 'Dashlet Properties~~',
-	'UI:Form:Property' => 'Property~~',
-	'UI:Form:Value' => 'Value~~',
-	'UI:DashletPlainText:Label' => 'Text~~',
-	'UI:DashletPlainText:Description' => 'Plain text (no formatting)~~',
-	'UI:DashletPlainText:Prop-Text' => 'Text~~',
-	'UI:DashletPlainText:Prop-Text:Default' => 'Please enter some text here...~~',
-	'UI:DashletObjectList:Label' => 'Object list~~',
-	'UI:DashletObjectList:Description' => 'Object list dashlet~~',
-	'UI:DashletObjectList:Prop-Title' => 'Title~~',
-	'UI:DashletObjectList:Prop-Query' => 'Query~~',
-	'UI:DashletObjectList:Prop-Menu' => 'Menu~~',
-	'UI:DashletGroupBy:Prop-Title' => 'Title~~',
-	'UI:DashletGroupBy:Prop-Query' => 'Query~~',
-	'UI:DashletGroupBy:Prop-Style' => 'Style~~',
-	'UI:DashletGroupBy:Prop-GroupBy' => 'Group by...~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Hour of %1$s (0-23)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Month of %1$s (1 - 12)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Day of week for %1$s~~',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Day of month for %1$s~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (hour)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (month)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (day of week)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (day of month)~~',
-	'UI:DashletGroupBy:MissingGroupBy' => 'Please select the field on which the objects will be grouped together~~',
-	'UI:DashletGroupByPie:Label' => 'Pie Chart~~',
-	'UI:DashletGroupByPie:Description' => 'Pie Chart~~',
-	'UI:DashletGroupByBars:Label' => 'Bar Chart~~',
-	'UI:DashletGroupByBars:Description' => 'Bar Chart~~',
-	'UI:DashletGroupByTable:Label' => 'Group By (table)~~',
-	'UI:DashletGroupByTable:Description' => 'List (Grouped by a field)~~',
-	'UI:DashletHeaderStatic:Label' => 'Header~~',
-	'UI:DashletHeaderStatic:Description' => 'Displays an horizontal separator~~',
-	'UI:DashletHeaderStatic:Prop-Title' => 'Title~~',
-	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacts~~',
-	'UI:DashletHeaderStatic:Prop-Icon' => 'Icon~~',
-	'UI:DashletHeaderDynamic:Label' => 'Header with statistics~~',
-	'UI:DashletHeaderDynamic:Description' => 'Header with stats (grouped by...)~~',
-	'UI:DashletHeaderDynamic:Prop-Title' => 'Title~~',
-	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contacts~~',
-	'UI:DashletHeaderDynamic:Prop-Icon' => 'Icon~~',
-	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Subtitle~~',
-	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contacts~~',
-	'UI:DashletHeaderDynamic:Prop-Query' => 'Query~~',
-	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Group by~~',
-	'UI:DashletHeaderDynamic:Prop-Values' => 'Values~~',
-	'UI:DashletBadge:Label' => 'Badge~~',
-	'UI:DashletBadge:Description' => 'Object Icon with new/search~~',
-	'UI:DashletBadge:Prop-Class' => 'Class~~',
-	'DayOfWeek-Sunday' => 'Sunday~~',
-	'DayOfWeek-Monday' => 'Monday~~',
-	'DayOfWeek-Tuesday' => 'Tuesday~~',
-	'DayOfWeek-Wednesday' => 'Wednesday~~',
-	'DayOfWeek-Thursday' => 'Thursday~~',
-	'DayOfWeek-Friday' => 'Friday~~',
-	'DayOfWeek-Saturday' => 'Saturday~~',
-	'Month-01' => 'January~~',
-	'Month-02' => 'February~~',
-	'Month-03' => 'March~~',
-	'Month-04' => 'April~~',
-	'Month-05' => 'May~~',
-	'Month-06' => 'June~~',
-	'Month-07' => 'July~~',
-	'Month-08' => 'August~~',
-	'Month-09' => 'September~~',
-	'Month-10' => 'October~~',
-	'Month-11' => 'November~~',
-	'Month-12' => 'December~~',
-	'DayOfWeek-Sunday-Min' => 'Su~~',
-	'DayOfWeek-Monday-Min' => 'Mo~~',
-	'DayOfWeek-Tuesday-Min' => 'Tu~~',
-	'DayOfWeek-Wednesday-Min' => 'We~~',
-	'DayOfWeek-Thursday-Min' => 'Th~~',
-	'DayOfWeek-Friday-Min' => 'Fr~~',
-	'DayOfWeek-Saturday-Min' => 'Sa~~',
-	'Month-01-Short' => 'Jan~~',
-	'Month-02-Short' => 'Feb~~',
-	'Month-03-Short' => 'Mar~~',
-	'Month-04-Short' => 'Apr~~',
-	'Month-05-Short' => 'May~~',
-	'Month-06-Short' => 'Jun~~',
-	'Month-07-Short' => 'Jul~~',
-	'Month-08-Short' => 'Aug~~',
-	'Month-09-Short' => 'Sep~~',
-	'Month-10-Short' => 'Oct~~',
-	'Month-11-Short' => 'Nov~~',
-	'Month-12-Short' => 'Dec~~',
-	'Calendar-FirstDayOfWeek' => '0~~',
-	'UI:Menu:ShortcutList' => 'Create a Shortcut...~~',
-	'UI:ShortcutRenameDlg:Title' => 'Rename the shortcut~~',
-	'UI:ShortcutListDlg:Title' => 'Create a shortcut for the list~~',
-	'UI:ShortcutDelete:Confirm' => 'Please confirm that wou wish to delete the shortcut(s).~~',
-	'Menu:MyShortcuts' => 'My Shortcuts~~',
-	'Class:Shortcut' => 'Shortcut~~',
-	'Class:Shortcut/Attribute:name' => 'Name~~',
-	'Class:Shortcut/Attribute:name+' => 'Label used in the menu and page title~~',
-	'Class:ShortcutOQL' => 'Search result shortcut~~',
-	'Class:ShortcutOQL/Attribute:oql' => 'Query~~',
-	'Class:ShortcutOQL/Attribute:oql+' => 'OQL defining the list of objects to search for~~',
-	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh~~',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled~~',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
-	'UI:FillAllMandatoryFields' => 'Please fill all mandatory fields.~~',
-	'UI:ValueMustBeSet' => 'Please specify a value~~',
-	'UI:ValueMustBeChanged' => 'Please change the value~~',
-	'UI:ValueInvalidFormat' => 'Invalid format~~',
-	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
-	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
-	'UI:CSVImportError_items' => 'Errors: %1$d~~',
-	'UI:CSVImportCreated_items' => 'Created: %1$d~~',
-	'UI:CSVImportModified_items' => 'Modified: %1$d~~',
-	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d~~',
-	'UI:Button:Remove' => 'Remove~~',
-	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
-	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
-	'UI:AboutBox' => 'About iTop...~~',
-	'UI:About:Title' => 'About iTop~~',
-	'UI:About:DataModel' => 'Data model~~',
-	'UI:About:Support' => 'Support information~~',
-	'UI:About:Licenses' => 'Licenses~~',
-	'UI:About:Modules' => 'Installed modules~~',
-	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
-	'UI:DisconnectedDlgTitle' => 'Warning!~~',
-	'UI:LoginAgain' => 'Login again~~',
-	'UI:StayOnThePage' => 'Stay on this page~~',
-	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
-	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
-	'ExcelExporter:ExportButton' => 'Export~~',
-	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
-	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
-	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
-	'ExcelExporter:Done' => 'Done.~~',
-	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
-	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
-	'ExcelExport:Statistics' => 'Statistics~~',
-	'portal:legacy_portal' => 'End-User Portal~~',
-	'portal:backoffice' => 'iTop Back-Office User Interface~~',
-	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
-	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
-	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
-	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
-	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
-	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
-	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
+	'Class:Query' => 'Query~~',
+	'Class:Query+' => 'A query is a data set defined in a dynamic way~~',
+	'Class:Query/Attribute:name' => 'Name~~',
+	'Class:Query/Attribute:name+' => 'Identifies the query~~',
+	'Class:Query/Attribute:description' => 'Description~~',
+	'Class:Query/Attribute:description+' => 'Long description for the query (purpose, usage, etc.)~~',
+	'Class:Query/Attribute:fields' => 'Fields~~',
+	'Class:Query/Attribute:fields+' => 'Coma separated list of attributes (or alias.attribute) to export~~',
+	'Class:QueryOQL' => 'OQL Query~~',
+	'Class:QueryOQL+' => 'A query based on the Object Query Language~~',
+	'Class:QueryOQL/Attribute:oql' => 'Expression~~',
+	'Class:QueryOQL/Attribute:oql+' => 'OQL Expression~~',
+	'Class:UserInternal' => 'User Internal~~',
+	'Class:UserInternal+' => 'User defined within iTop~~',
+	'UI:Button:Save' => 'Save~~',
+	'UI:Button:Restart' => ' |<< Restart ~~',
+	'UI:Button:Rename' => ' Rename... ~~',
+	'UI:History:BulkImports' => 'History~~',
+	'UI:History:BulkImports+' => 'List of CSV imports (latest import first)~~',
+	'UI:History:BulkImportDetails' => 'Changes resulting from the CSV import performed on %1$s (by %2$s)~~',
+	'UI:History:StatsCreations' => 'Created~~',
+	'UI:History:StatsCreations+' => 'Count of objects created~~',
+	'UI:History:StatsModifs' => 'Modified~~',
+	'UI:History:StatsModifs+' => 'Count of objects modified~~',
+	'UI:History:StatsDeletes' => 'Deleted~~',
+	'UI:History:StatsDeletes+' => 'Count of objects deleted~~',
+	'UI:SplitDateTime-Date' => 'date~~',
+	'UI:SplitDateTime-Time' => 'time~~',
+	'UI:SearchValue:NbSelected' => '# selected~~',
+	'UI:SearchValue:CheckAll' => 'Check All~~',
+	'UI:SearchValue:UncheckAll' => 'Uncheck All~~',
+	'UI:Login:ForgotPwd' => 'Forgot your password?~~',
+	'UI:Login:ForgotPwdForm' => 'Forgot your password~~',
+	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.~~',
+	'UI:Login:ResetPassword' => 'Send now!~~',
+	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
+	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
+	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
+	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
+	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
+	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
+	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
+	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
+	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...~~',
+	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
+	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href=\"%1$s\">enter a new password</a></p>.~~',
+	'UI:ResetPwd-Title' => 'Reset password~~',
+	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
+	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
+	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
+	'UI:ResetPwd-Login' => 'Click here to login...~~',
+	'UI:Login:PasswordChanged' => 'Password successfully set!~~',
+	'UI:AccessRO-All' => 'iTop is read-only~~',
+	'UI:AccessRO-Users' => 'iTop is read-only for end-users~~',
+	'UI:ApplicationEnvironment' => 'Application environment: %1$s~~',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronization of %1$d objects of class %2$s~~',
+	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
+	'UI:CSVReport-Value-Modified' => 'Modified~~',
+	'UI:CSVReport-Value-SetIssue' => 'Could not be changed - reason: %1$s~~',
+	'UI:CSVReport-Value-ChangeIssue' => 'Could not be changed to %1$s - reason: %2$s~~',
+	'UI:CSVReport-Value-NoMatch' => 'No match~~',
+	'UI:CSVReport-Value-Missing' => 'Missing mandatory value~~',
+	'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects~~',
+	'UI:CSVReport-Row-Unchanged' => 'unchanged~~',
+	'UI:CSVReport-Row-Created' => 'created~~',
+	'UI:CSVReport-Row-Updated' => 'updated %1$d cols~~',
+	'UI:CSVReport-Row-Disappeared' => 'disappeared, changed %1$d cols~~',
+	'UI:CSVReport-Row-Issue' => 'Issue: %1$s~~',
+	'UI:CSVReport-Value-Issue-Null' => 'Null not allowed~~',
+	'UI:CSVReport-Value-Issue-NotFound' => 'Object not found~~',
+	'UI:CSVReport-Value-Issue-FoundMany' => 'Found %1$d matches~~',
+	'UI:CSVReport-Value-Issue-Readonly' => 'The attribute \'%1$s\' is read-only and cannot be modified (current value: %2$s, proposed value: %3$s)~~',
+	'UI:CSVReport-Value-Issue-Format' => 'Failed to process input: %1$s~~',
+	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling~~',
+	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s~~',
+	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributes not consistent with each others: %1$s~~',
+	'UI:CSVReport-Row-Issue-Attribute' => 'Unexpected attribute value(s)~~',
+	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Could not be created, due to missing external key(s): %1$s~~',
+	'UI:CSVReport-Row-Issue-DateFormat' => 'wrong date format~~',
+	'UI:CSVReport-Row-Issue-Reconciliation' => 'failed to reconcile~~',
+	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation~~',
+	'UI:CSVReport-Row-Issue-Internal' => 'Internal error: %1$s, %2$s~~',
+	'UI:CSVReport-Icon-Unchanged' => 'Unchanged~~',
+	'UI:CSVReport-Icon-Modified' => 'Modified~~',
+	'UI:CSVReport-Icon-Missing' => 'Missing~~',
+	'UI:CSVReport-Object-MissingToUpdate' => 'Missing object: will be updated~~',
+	'UI:CSVReport-Object-MissingUpdated' => 'Missing object: updated~~',
+	'UI:CSVReport-Icon-Created' => 'Created~~',
+	'UI:CSVReport-Object-ToCreate' => 'Object will be created~~',
+	'UI:CSVReport-Object-Created' => 'Object created~~',
+	'UI:CSVReport-Icon-Error' => 'Error~~',
+	'UI:CSVReport-Object-Error' => 'ERROR: %1$s~~',
+	'UI:CSVReport-Object-Ambiguous' => 'AMBIGUOUS: %1$s~~',
+	'UI:CSVReport-Stats-Errors' => '%1$.0f %% of the loaded objects have errors and will be ignored.~~',
+	'UI:CSVReport-Stats-Created' => '%1$.0f %% of the loaded objects will be created.~~',
+	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of the loaded objects will be modified.~~',
+	'UI:CSVExport:AdvancedMode' => 'Advanced mode~~',
+	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.~~',
+	'UI:CSVExport:LostChars' => 'Encoding issue~~',
+	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').~~',
+	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in the Rule %1$s: %2$s.~~',
+	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in the Category %1$s: %2$s.~~',
+	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries~~',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
+	'UI:Edit:TestQuery' => 'Test query~~',
+	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'This object could not be deleted because some manual operations must be performed prior to that~~',
+	'UI:Delete:Deleted' => 'deleted~~',
+	'UI:Delete:CannotDeleteBecause' => 'Could not be deleted: %1$s~~',
+	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Should be automaticaly deleted, but this is not feasible: %1$s~~',
+	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Must be deleted manually, but this is not feasible: %1$s~~',
+	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
+	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
+	'UI:Search:Enlarge' => 'Broaden the search~~',
+	'Menu:QueryMenu' => 'Query phrasebook~~',
+	'Menu:QueryMenu+' => 'Query phrasebook~~',
+	'UI:Download-CSV' => 'Download %1$s~~',
+	'UI:RelationGroups' => 'Groups~~',
+	'UI:OperationCancelled' => 'Operation Cancelled~~',
+	'UI:ElementsDisplayed' => 'Filtering~~',
+	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
+	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
+	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
+	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
+	'UI:Relation:NoneSelected' => 'None~~',
+	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
+	'UI:Relation:DrillDown' => 'Details...~~',
+	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
+	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
+	'UI:RelationOption:Untitled' => 'Untitled~~',
+	'UI:Relation:Key' => 'Key~~',
+	'UI:Relation:Comments' => 'Comments~~',
+	'UI:RelationOption:Title' => 'Title~~',
+	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
+	'UI:RelationOption:Comments' => 'Comments~~',
+	'UI:Button:Export' => 'Export~~',
+	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
+	'UI:PageFormat_A3' => 'A3~~',
+	'UI:PageFormat_A4' => 'A4~~',
+	'UI:PageFormat_Letter' => 'Letter~~',
+	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
+	'UI:PageOrientation_Portrait' => 'Portrait~~',
+	'UI:PageOrientation_Landscape' => 'Landscape~~',
+	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
+	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
+	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
+	'Portal:NoRequestMgmt' => 'Dear %1$s, you have been redirected to this page because your account is configured with the profile \'Portal user\'. Unfortunately, iTop has not been installed with the feature \'Request Management\'. Please contact your administrator.~~',
+	'Portal:TitleDetailsFor_Request' => 'Details for request~~',
+	'Portal:Button:ReopenTicket' => 'Reopen this ticket~~',
+	'Portal:Attachments' => 'Attachments~~',
+	'Portal:AddAttachment' => ' Add Attachment ~~',
+	'Portal:RemoveAttachment' => ' Remove Attachment ~~',
+	'Portal:Attachment_No_To_Ticket_Name' => 'Attachment #%1$d to %2$s (%3$s)~~',
+	'Portal:SelectRequestTemplate' => 'Select a template for %1$s~~',
+	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Days %2$s Hours %3$s Minutes %4$s Seconds~~',
+	'UI:ModifyAllPageTitle' => 'Modify All~~',
+	'UI:Modify_N_ObjectsOf_Class' => 'Modifying %1$d objects of class %2$s~~',
+	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifying %1$d objects of class %2$s out of %3$d~~',
+	'UI:Menu:ModifyAll' => 'Modify...~~',
+	'UI:Button:ModifyAll' => 'Modify All~~',
+	'UI:Button:PreviewModifications' => 'Preview Modifications >>~~',
+	'UI:ModifiedObject' => 'Object Modified~~',
+	'UI:BulkModifyStatus' => 'Operation~~',
+	'UI:BulkModifyStatus+' => 'Status of the operation~~',
+	'UI:BulkModifyErrors' => 'Errors (if any)~~',
+	'UI:BulkModifyErrors+' => 'Errors preventing the modification~~',
+	'UI:BulkModifyStatusOk' => 'Ok~~',
+	'UI:BulkModifyStatusError' => 'Error~~',
+	'UI:BulkModifyStatusModified' => 'Modified~~',
+	'UI:BulkModifyStatusSkipped' => 'Skipped~~',
+	'UI:BulkModify_Count_DistinctValues' => '%1$d distinct values:~~',
+	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d time(s)~~',
+	'UI:BulkModify:N_MoreValues' => '%1$d more values...~~',
+	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Attempting to set the read-only field: %1$s~~',
+	'UI:FailedToApplyStimuli' => 'The action has failed.~~',
+	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Modifying %2$d objects of class %3$s~~',
+	'UI:CaseLogTypeYourTextHere' => 'Type your text here:~~',
+	'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.~~',
+	'UI:Pagination:HeaderSelection' => 'Total: %1$s objects (%2$s objects selected).~~',
+	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objects.~~',
+	'UI:Pagination:PageSize' => '%1$s objects per page~~',
+	'UI:Pagination:PagesLabel' => 'Pages:~~',
+	'UI:Pagination:All' => 'All~~',
+	'UI:HierarchyOf_Class' => 'Hierarchy of %1$s~~',
+	'UI:Preferences' => 'Preferences...~~',
+	'UI:FavoriteOrganizations' => 'Favorite Organizations~~',
+	'UI:FavoriteOrganizations+' => 'Check in the list below the organizations that you want to see in the drop-down menu for a quick access. Note that this is not a security setting, objects from any organization are still visible and can be accessed by selecting \"All Organizations\" in the drop-down list.~~',
+	'UI:FavoriteLanguage' => 'Language of the User Interface~~',
+	'UI:Favorites:SelectYourLanguage' => 'Select your preferred language~~',
+	'UI:FavoriteOtherSettings' => 'Other Settings~~',
+	'UI:Favorites:Default_X_ItemsPerPage' => 'Default length for lists:  %1$s items per page~~',
+	'UI:NavigateAwayConfirmationMessage' => 'Any modification will be discarded.~~',
+	'UI:CancelConfirmationMessage' => 'You will loose your changes. Continue anyway?~~',
+	'UI:AutoApplyConfirmationMessage' => 'Some changes have not been applied yet. Do you want itop to take them into account?~~',
+	'UI:Create_Class_InState' => 'Create the %1$s in state: ~~',
+	'UI:OrderByHint_Values' => 'Sort order: %1$s~~',
+	'UI:Menu:AddToDashboard' => 'Add To Dashboard...~~',
+	'UI:ConfigureThisList' => 'Configure This List...~~',
+	'UI:ListConfigurationTitle' => 'List Configuration~~',
+	'UI:ColumnsAndSortOrder' => 'Columns and sort order:~~',
+	'UI:UseDefaultSettings' => 'Use the Default Settings~~',
+	'UI:UseSpecificSettings' => 'Use the Following Settings:~~',
+	'UI:Display_X_ItemsPerPage' => 'Display %1$s items per page~~',
+	'UI:UseSavetheSettings' => 'Save the Settings~~',
+	'UI:OnlyForThisList' => 'Only for this list~~',
+	'UI:ForAllLists' => 'Default for all lists~~',
+	'UI:ExtKey_AsLink' => '%1$s (Link)~~',
+	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)~~',
+	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)~~',
+	'UI:Button:MoveUp' => 'Move Up~~',
+	'UI:Button:MoveDown' => 'Move Down~~',
+	'UI:OQL:UnknownClassAndFix' => 'Unknown class \"%1$s\". You may try \"%2$s\" instead.~~',
+	'UI:OQL:UnknownClassNoFix' => 'Unknown class \"%1$s\"~~',
+	'UI:Dashboard:Edit' => 'Edit This Page...~~',
+	'UI:Dashboard:Revert' => 'Revert To Original Version...~~',
+	'UI:Dashboard:RevertConfirm' => 'Every changes made to the original version will be lost. Please confirm that you want to do this.~~',
+	'UI:ExportDashBoard' => 'Export to a file~~',
+	'UI:ImportDashBoard' => 'Import from a file...~~',
+	'UI:ImportDashboardTitle' => 'Import From a File~~',
+	'UI:ImportDashboardText' => 'Select a dashboard file to import:~~',
+	'UI:DashletCreation:Title' => 'Create a new Dashlet~~',
+	'UI:DashletCreation:Dashboard' => 'Dashboard~~',
+	'UI:DashletCreation:DashletType' => 'Dashlet Type~~',
+	'UI:DashletCreation:EditNow' => 'Edit the Dashboard~~',
+	'UI:DashboardEdit:Title' => 'Dashboard Editor~~',
+	'UI:DashboardEdit:DashboardTitle' => 'Title~~',
+	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
+	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~',
+	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
+	'UI:DashboardEdit:Layout' => 'Layout~~',
+	'UI:DashboardEdit:Properties' => 'Dashboard Properties~~',
+	'UI:DashboardEdit:Dashlets' => 'Available Dashlets~~',
+	'UI:DashboardEdit:DashletProperties' => 'Dashlet Properties~~',
+	'UI:Form:Property' => 'Property~~',
+	'UI:Form:Value' => 'Value~~',
+	'UI:DashletPlainText:Label' => 'Text~~',
+	'UI:DashletPlainText:Description' => 'Plain text (no formatting)~~',
+	'UI:DashletPlainText:Prop-Text' => 'Text~~',
+	'UI:DashletPlainText:Prop-Text:Default' => 'Please enter some text here...~~',
+	'UI:DashletObjectList:Label' => 'Object list~~',
+	'UI:DashletObjectList:Description' => 'Object list dashlet~~',
+	'UI:DashletObjectList:Prop-Title' => 'Title~~',
+	'UI:DashletObjectList:Prop-Query' => 'Query~~',
+	'UI:DashletObjectList:Prop-Menu' => 'Menu~~',
+	'UI:DashletGroupBy:Prop-Title' => 'Title~~',
+	'UI:DashletGroupBy:Prop-Query' => 'Query~~',
+	'UI:DashletGroupBy:Prop-Style' => 'Style~~',
+	'UI:DashletGroupBy:Prop-GroupBy' => 'Group by...~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Hour of %1$s (0-23)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Month of %1$s (1 - 12)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Day of week for %1$s~~',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Day of month for %1$s~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (hour)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (month)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (day of week)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (day of month)~~',
+	'UI:DashletGroupBy:MissingGroupBy' => 'Please select the field on which the objects will be grouped together~~',
+	'UI:DashletGroupByPie:Label' => 'Pie Chart~~',
+	'UI:DashletGroupByPie:Description' => 'Pie Chart~~',
+	'UI:DashletGroupByBars:Label' => 'Bar Chart~~',
+	'UI:DashletGroupByBars:Description' => 'Bar Chart~~',
+	'UI:DashletGroupByTable:Label' => 'Group By (table)~~',
+	'UI:DashletGroupByTable:Description' => 'List (Grouped by a field)~~',
+	'UI:DashletHeaderStatic:Label' => 'Header~~',
+	'UI:DashletHeaderStatic:Description' => 'Displays an horizontal separator~~',
+	'UI:DashletHeaderStatic:Prop-Title' => 'Title~~',
+	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacts~~',
+	'UI:DashletHeaderStatic:Prop-Icon' => 'Icon~~',
+	'UI:DashletHeaderDynamic:Label' => 'Header with statistics~~',
+	'UI:DashletHeaderDynamic:Description' => 'Header with stats (grouped by...)~~',
+	'UI:DashletHeaderDynamic:Prop-Title' => 'Title~~',
+	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contacts~~',
+	'UI:DashletHeaderDynamic:Prop-Icon' => 'Icon~~',
+	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Subtitle~~',
+	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contacts~~',
+	'UI:DashletHeaderDynamic:Prop-Query' => 'Query~~',
+	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Group by~~',
+	'UI:DashletHeaderDynamic:Prop-Values' => 'Values~~',
+	'UI:DashletBadge:Label' => 'Badge~~',
+	'UI:DashletBadge:Description' => 'Object Icon with new/search~~',
+	'UI:DashletBadge:Prop-Class' => 'Class~~',
+	'DayOfWeek-Sunday' => 'Sunday~~',
+	'DayOfWeek-Monday' => 'Monday~~',
+	'DayOfWeek-Tuesday' => 'Tuesday~~',
+	'DayOfWeek-Wednesday' => 'Wednesday~~',
+	'DayOfWeek-Thursday' => 'Thursday~~',
+	'DayOfWeek-Friday' => 'Friday~~',
+	'DayOfWeek-Saturday' => 'Saturday~~',
+	'Month-01' => 'January~~',
+	'Month-02' => 'February~~',
+	'Month-03' => 'March~~',
+	'Month-04' => 'April~~',
+	'Month-05' => 'May~~',
+	'Month-06' => 'June~~',
+	'Month-07' => 'July~~',
+	'Month-08' => 'August~~',
+	'Month-09' => 'September~~',
+	'Month-10' => 'October~~',
+	'Month-11' => 'November~~',
+	'Month-12' => 'December~~',
+	'DayOfWeek-Sunday-Min' => 'Su~~',
+	'DayOfWeek-Monday-Min' => 'Mo~~',
+	'DayOfWeek-Tuesday-Min' => 'Tu~~',
+	'DayOfWeek-Wednesday-Min' => 'We~~',
+	'DayOfWeek-Thursday-Min' => 'Th~~',
+	'DayOfWeek-Friday-Min' => 'Fr~~',
+	'DayOfWeek-Saturday-Min' => 'Sa~~',
+	'Month-01-Short' => 'Jan~~',
+	'Month-02-Short' => 'Feb~~',
+	'Month-03-Short' => 'Mar~~',
+	'Month-04-Short' => 'Apr~~',
+	'Month-05-Short' => 'May~~',
+	'Month-06-Short' => 'Jun~~',
+	'Month-07-Short' => 'Jul~~',
+	'Month-08-Short' => 'Aug~~',
+	'Month-09-Short' => 'Sep~~',
+	'Month-10-Short' => 'Oct~~',
+	'Month-11-Short' => 'Nov~~',
+	'Month-12-Short' => 'Dec~~',
+	'Calendar-FirstDayOfWeek' => '0~~',
+	'UI:Menu:ShortcutList' => 'Create a Shortcut...~~',
+	'UI:ShortcutRenameDlg:Title' => 'Rename the shortcut~~',
+	'UI:ShortcutListDlg:Title' => 'Create a shortcut for the list~~',
+	'UI:ShortcutDelete:Confirm' => 'Please confirm that wou wish to delete the shortcut(s).~~',
+	'Menu:MyShortcuts' => 'My Shortcuts~~',
+	'Class:Shortcut' => 'Shortcut~~',
+	'Class:Shortcut/Attribute:name' => 'Name~~',
+	'Class:Shortcut/Attribute:name+' => 'Label used in the menu and page title~~',
+	'Class:ShortcutOQL' => 'Search result shortcut~~',
+	'Class:ShortcutOQL/Attribute:oql' => 'Query~~',
+	'Class:ShortcutOQL/Attribute:oql+' => 'OQL defining the list of objects to search for~~',
+	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh~~',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled~~',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
+	'UI:FillAllMandatoryFields' => 'Please fill all mandatory fields.~~',
+	'UI:ValueMustBeSet' => 'Please specify a value~~',
+	'UI:ValueMustBeChanged' => 'Please change the value~~',
+	'UI:ValueInvalidFormat' => 'Invalid format~~',
+	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
+	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
+	'UI:CSVImportError_items' => 'Errors: %1$d~~',
+	'UI:CSVImportCreated_items' => 'Created: %1$d~~',
+	'UI:CSVImportModified_items' => 'Modified: %1$d~~',
+	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d~~',
+	'UI:Button:Remove' => 'Remove~~',
+	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
+	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
+	'UI:AboutBox' => 'About iTop...~~',
+	'UI:About:Title' => 'About iTop~~',
+	'UI:About:DataModel' => 'Data model~~',
+	'UI:About:Support' => 'Support information~~',
+	'UI:About:Licenses' => 'Licenses~~',
+	'UI:About:Modules' => 'Installed modules~~',
+	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
+	'UI:DisconnectedDlgTitle' => 'Warning!~~',
+	'UI:LoginAgain' => 'Login again~~',
+	'UI:StayOnThePage' => 'Stay on this page~~',
+	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
+	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
+	'ExcelExporter:ExportButton' => 'Export~~',
+	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
+	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
+	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
+	'ExcelExporter:Done' => 'Done.~~',
+	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
+	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
+	'ExcelExport:Statistics' => 'Statistics~~',
+	'portal:legacy_portal' => 'End-User Portal~~',
+	'portal:backoffice' => 'iTop Back-Office User Interface~~',
+	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
+	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
+	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
+	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
+	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
+	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
+	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
 ));
 
 

Деякі файли не було показано, через те що забагато файлів було змінено