N°1047.1 Internal: Modified some calls to the ITOP_XXX constants.

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

core/config.class.inc.php

@@ -18,6 +18,7 @@
 
 
 define('ITOP_APPLICATION', 'iTop');
+define('ITOP_APPLICATION_SHORT', 'iTop');
 define('ITOP_VERSION', '2.4.x');
 define('ITOP_REVISION', 'svn');
 define('ITOP_BUILD_DATE', '$WCNOW$');

datamodels/2.x/itop-portal-base/cs.dict.itop-portal-base.php

@@ -29,7 +29,7 @@
 
 // Portal
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-    'Page:DefaultTitle' => 'Uživatelský portál iTop',
+    'Page:DefaultTitle' => 'Uživatelský portál %1$s',
     'Page:PleaseWait' => 'Počkejte prosím',
     'Page:Home' => 'Domů',
     'Page:GoPortalHome' => 'Domů',

datamodels/2.x/itop-portal-base/de.dict.itop-portal-base.php

@@ -26,7 +26,7 @@
 
 // Portal
 Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Page:DefaultTitle' => 'iTop - Benutzer Portal',
+	'Page:DefaultTitle' => '%1$s - Benutzer Portal',
 	'Page:PleaseWait' => 'Bitte warten...',
 	'Page:Home' => 'Start',
 	'Page:GoPortalHome' => 'Startseite',
@@ -44,8 +44,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
     'Error:HTTP:401' => 'Authentication~~',
     'Error:HTTP:404' => 'Seite nicht gefunden.',
 	'Error:HTTP:500' => 'Oops! Es ist ein Fehler aufgetreten.',
-	'Error:HTTP:GetHelp' => 'Bitte kontaktieren Sie Ihren iTop administrator falls das Problem öfter auftaucht.',
-	'Error:XHR:Fail' => 'Konnte Daten nicht laden, bitte kontaktieren Sie Ihren iTop administrator',
+	'Error:HTTP:GetHelp' => 'Bitte kontaktieren Sie Ihren %1$s administrator falls das Problem öfter auftaucht.',
+	'Error:XHR:Fail' => 'Konnte Daten nicht laden, bitte kontaktieren Sie Ihren %1$s administrator',
     'Portal:ErrorUserLoggedOut' => 'You are logged out and need to log in again in order to continue.~~',
     'Portal:Datatables:Language:Processing' => 'Bitte warten...',
 	'Portal:Datatables:Language:Search' => 'Filter :',
@@ -76,8 +76,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Brick:Portal:UserProfile:Password:Title' => 'Passwort',
 	'Brick:Portal:UserProfile:Password:ChoosePassword' => 'Passwort wählen',
 	'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Passwort bestätigen',
-	'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Um das Password zu ändern, kontaktieren Sie bitte Ihren iTop Administrator',
-	'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Kann das Passwort nicht ändern - bitte kontaktieren Sie Ihren iTop Administrator',
+	'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Um das Password zu ändern, kontaktieren Sie bitte Ihren %1$s Administrator',
+	'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Kann das Passwort nicht ändern - bitte kontaktieren Sie Ihren %1$s Administrator',
 	'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Persönliche Informationen',
 	'Brick:Portal:UserProfile:Photo:Title' => 'Foto',
 ));

datamodels/2.x/itop-portal-base/en.dict.itop-portal-base.php

@@ -25,7 +25,7 @@
 
 // Portal
 Dict::Add('EN US', 'English', 'English', array(
-	'Page:DefaultTitle' => 'iTop User portal',
+	'Page:DefaultTitle' => '%1$s User portal',
 	'Page:PleaseWait' => 'Please wait...',
 	'Page:Home' => 'Home',
 	'Page:GoPortalHome' => 'Home page',
@@ -43,8 +43,8 @@ Dict::Add('EN US', 'English', 'English', array(
     'Error:HTTP:401' => 'Authentication',
     'Error:HTTP:404' => 'Page not found',
 	'Error:HTTP:500' => 'Oops! An error has occured.',
-	'Error:HTTP:GetHelp' => 'Please contact your iTop administrator if the problem keeps happening.',
-	'Error:XHR:Fail' => 'Could not load data, please contact your iTop administrator',
+	'Error:HTTP:GetHelp' => 'Please contact your %1$s administrator if the problem keeps happening.',
+	'Error:XHR:Fail' => 'Could not load data, please contact your %1$s administrator',
     'Portal:ErrorUserLoggedOut' => 'You are logged out and need to log in again in order to continue.',
     'Portal:Datatables:Language:Processing' => 'Please wait...',
 	'Portal:Datatables:Language:Search' => 'Filter:',
@@ -76,8 +76,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Brick:Portal:UserProfile:Password:Title' => 'Password',
 	'Brick:Portal:UserProfile:Password:ChoosePassword' => 'Choose password',
 	'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Confirm password',
-	'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'To change your password, please contact your iTop administrator',
-	'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Can\'t change password, please contact your iTop administrator',
+	'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'To change your password, please contact your %1$s administrator',
+	'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Can\'t change password, please contact your %1$s administrator',
 	'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal informations',
 	'Brick:Portal:UserProfile:Photo:Title' => 'Photo',
 ));

datamodels/2.x/itop-portal-base/es_cr.dict.itop-portal-base.php

@@ -25,7 +25,7 @@
 
 // Portal
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Page:DefaultTitle' => 'iTop User portal',
+	'Page:DefaultTitle' => '%1$s User portal',
 	'Page:PleaseWait' => 'Please wait...',
 	'Page:Home' => 'Bienvenido',
 	'Page:GoPortalHome' => 'Regresar a bienvenida',
@@ -43,8 +43,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
     'Error:HTTP:401' => 'Authentication~~',
     'Error:HTTP:404' => 'Página no encontrada',
 	'Error:HTTP:500' => '¡Vaya! Ha ocurrido un error.',
-	'Error:HTTP:GetHelp' => 'Póngase en contacto con el administrador de iTop si el problema persiste.',
-	'Error:XHR:Fail' => 'No se pudieron cargar datos, póngase en contacto con su administrador de iTop',
+	'Error:HTTP:GetHelp' => 'Póngase en contacto con el administrador de %1$s si el problema persiste.',
+	'Error:XHR:Fail' => 'No se pudieron cargar datos, póngase en contacto con su administrador de %1$s',
     'Portal:ErrorUserLoggedOut' => 'You are logged out and need to log in again in order to continue.~~',
     'Portal:Datatables:Language:Processing' => 'Por favor esperar...',
 	'Portal:Datatables:Language:Search' => 'Filtrar:',
@@ -76,8 +76,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Brick:Portal:UserProfile:Password:Title' => 'Contraseña',
 	'Brick:Portal:UserProfile:Password:ChoosePassword' => 'Elegir una contraseña',
 	'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Confirmar contraseña',
-	'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Para cambiar su contraseña, póngase en contacto con su administrador de iTop',
-	'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'No se puede cambiar la contraseña, póngase en contacto con el administrador de iTop',
+	'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Para cambiar su contraseña, póngase en contacto con su administrador de %1$s',
+	'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'No se puede cambiar la contraseña, póngase en contacto con el administrador de %1$s',
 	'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Informaciones personales',
 	'Brick:Portal:UserProfile:Photo:Title' => 'Foto',
 ));

datamodels/2.x/itop-portal-base/fr.dict.itop-portal-base.php

@@ -25,7 +25,7 @@
 
 // Portal
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Page:DefaultTitle' => 'Portail utilisateur iTop',
+	'Page:DefaultTitle' => 'Portail utilisateur %1$s',
 	'Page:PleaseWait' => 'Veuillez patienter...',
 	'Page:Home' => 'Accueil',
 	'Page:GoPortalHome' => 'Revenir à l\'accueil',
@@ -43,8 +43,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
     'Error:HTTP:401' => 'Authentification',
     'Error:HTTP:404' => 'Page non trouvée',
 	'Error:HTTP:500' => 'Oups ! Une erreur est survenue.',
-	'Error:HTTP:GetHelp' => 'Si le problème persiste, veuillez contacter votre administrateur iTop.',
-	'Error:XHR:Fail' => 'Impossible de charger les données, veuillez contacter votre administrateur iTop si le problème persiste.',
+	'Error:HTTP:GetHelp' => 'Si le problème persiste, veuillez contacter votre administrateur %1$s.',
+	'Error:XHR:Fail' => 'Impossible de charger les données, veuillez contacter votre administrateur %1$s si le problème persiste.',
     'Portal:ErrorUserLoggedOut' => 'Vous êtes déconnecté et devez vous reconnecter pour continuer.',
 	'Portal:Datatables:Language:Processing' => 'Veuillez patienter...',
 	'Portal:Datatables:Language:Search' => 'Filtrer :',
@@ -76,8 +76,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Brick:Portal:UserProfile:Password:Title' => 'Mot de passe',
 	'Brick:Portal:UserProfile:Password:ChoosePassword' => 'Choisissez un mot de passe',
 	'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Confirmer le mot de passe',
-	'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Veuillez vous adresser à votre administrateur iTop pour changer votre mot de passe',
-	'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Impossible de modifier votre mot de passe, veuillez contacter votre administrateur iTop',
+	'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Veuillez vous adresser à votre administrateur %1$s pour changer votre mot de passe',
+	'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Impossible de modifier votre mot de passe, veuillez contacter votre administrateur %1$s',
 	'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Informations personnelles',
 	'Brick:Portal:UserProfile:Photo:Title' => 'Photo',
 ));

datamodels/2.x/itop-portal-base/nl.dict.itop-portal-base.php

@@ -25,7 +25,7 @@
 
 // Portal
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Page:DefaultTitle' => 'iTop Gebruikersportaal',
+	'Page:DefaultTitle' => '%1$s Gebruikersportaal',
 	'Page:PleaseWait' => 'Even geduld...',
 	'Page:Home' => 'Welkom',
 	'Page:GoPortalHome' => 'Startpagina',

datamodels/2.x/itop-portal-base/portal/src/forms/passwordformmanager.class.inc.php

@@ -113,7 +113,7 @@ class PasswordFormManager extends FormManager
 					if (!UserRights::CanChangePassword())
 					{
 						$aData['valid'] = false;
-						$aData['messages']['error'] += array('_main' => array(Dict::S('Brick:Portal:UserProfile:Password:CantChangeContactAdministrator')));
+						$aData['messages']['error'] += array('_main' => array(Dict::Format('Brick:Portal:UserProfile:Password:CantChangeContactAdministrator', ITOP_APPLICATION_SHORT)));
 					}
 					else if (!UserRights::CheckCredentials($sAuthUser, $sOldPassword))
 					{
@@ -128,7 +128,7 @@ class PasswordFormManager extends FormManager
 					else if (!UserRights::ChangePassword($sOldPassword, $sNewPassword))
 					{
 						$aData['valid'] = false;
-						$aData['messages']['error'] += array('confirm_password' => array(Dict::S('Brick:Portal:UserProfile:Password:CantChangeForUnknownReason')));
+						$aData['messages']['error'] += array('confirm_password' => array(Dict::Format('Brick:Portal:UserProfile:Password:CantChangeForUnknownReason', ITOP_APPLICATION_SHORT)));
 					}
 					else
 					{

datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_mosaic.html.twig

@@ -127,7 +127,7 @@
 				registerToggleListeners();
 			})
 			.fail(function() {
-				alert('{{ 'Error:XHR:Fail'|dict_s }}');
+				alert('{{ 'Error:XHR:Fail'|dict_format(constant('ITOP_APPLICATION_SHORT')) }}');
 			})
 			.always(function(){
                 hideMosaicLoader();

datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_tree.html.twig

@@ -170,7 +170,7 @@
 				registerToggleListeners();
 			})
 			.fail(function() {
-				alert('{{ 'Error:XHR:Fail'|dict_s }}');
+				alert('{{ 'Error:XHR:Fail'|dict_format(constant('ITOP_APPLICATION_SHORT')) }}');
 			});
 		};
 		// Build tree nodes from data under the nodeId

datamodels/2.x/itop-portal-base/portal/src/views/bricks/layout.html.twig

@@ -5,7 +5,7 @@
 {% block pPageTitle %}
 	{# Overloading the default template's title to show the brick's title #}
 	{% if oBrick is defined and oBrick is not null and oBrick.GetTitle() != '' %}
-		{{ oBrick.GetTitle()|dict_s }} - iTop
+		{{ oBrick.GetTitle()|dict_s }} - {{ constant('ITOP_APPLICATION_SHORT') }}
 	{% else %}
 		{{ parent() }}
 	{% endif %}

datamodels/2.x/itop-portal-base/portal/src/views/errors/layout.html.twig

@@ -40,7 +40,7 @@
 		<div class="well">
 			<h1><div class="ion ion-alert-circled"></div> {{ error_title }}</h1>
 			<p>{{ error_message }}</p>
-			<p>{{ 'Error:HTTP:GetHelp'|dict_s }}</p>
+			<p>{{ 'Error:HTTP:GetHelp'|dict_format(constant('ITOP_APPLICATION_SHORT')) }}</p>
 			<p>
 				<a class="btn btn-default" href="#" onclick="history.back(); return false;"><span class="fa fa-arrow-left"></span> {{ 'Page:GoPreviousPage'|dict_s }}</a>
 				<a class="btn btn-default" href=""><span class="fa fa-repeat"></span> {{ 'Page:ReloadPage'|dict_s }}</a>

datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig

@@ -22,7 +22,7 @@
 	{# This block can be used to add your own meta tags by extending the default template #}
 	{% block pPageExtraMetas %}
 	{% endblock %}
-	<title>{% block pPageTitle %}{% if sPageTitle is defined and sPageTitle is not null %}{{ sPageTitle }} - {{ constant('ITOP_APPLICATION') }}{% else %}{{ 'Page:DefaultTitle'|dict_s }}{% endif %}{% endblock %}</title>
+	<title>{% block pPageTitle %}{% if sPageTitle is defined and sPageTitle is not null %}{{ sPageTitle }} - {{ constant('ITOP_APPLICATION_SHORT') }}{% else %}{{ 'Page:DefaultTitle'|dict_format(constant('ITOP_APPLICATION_SHORT')) }}{% endif %}{% endblock %}</title>
 	<link rel="shortcut icon" href="{{ app['combodo.absolute_url'] ~ 'images/favicon.ico'|add_itop_version }}" />
 
 	{% block pPageStylesheets %}
@@ -403,7 +403,7 @@
 					}
 				    if(sBody === undefined)
 					{
-                        sBody = '{{ 'Error:XHR:Fail'|dict_s|escape('js') }}';
+                        sBody = '{{ 'Error:XHR:Fail'|dict_format(constant('ITOP_APPLICATION_SHORT'))|escape('js') }}';
 					}
 					var oModalElem = $('#modal-for-alert');
                     oModalElem.find('.modal-content .modal-header .modal-title').html(sTitle);

datamodels/2.x/itop-portal-base/ru.dict.itop-portal-base.php

@@ -12,7 +12,7 @@
 
 // Portal
 Dict::Add('RU RU', 'Russian', 'Русский', array(
-    'Page:DefaultTitle' => 'Пользовательский портал iTop',
+    'Page:DefaultTitle' => 'Пользовательский портал %1$s',
     'Page:PleaseWait' => 'Пожалуйста, подождите...',
     'Page:Home' => 'Домашняя страница',
     'Page:GoPortalHome' => 'Домашняя страница',
@@ -28,8 +28,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
     'Error:HTTP:401' => 'Authentication~~',
     'Error:HTTP:404' => 'Страница не найдена',
     'Error:HTTP:500' => 'Упс! Произошла ошибка.',
-    'Error:XHR:Fail' => 'Не удалось загрузить данные. Пожалуйста, свяжитесь с вашим администратором iTop.',
-    'Error:HTTP:GetHelp' => 'Пожалуйста, свяжитесь с вашим администратором iTop, если проблема сохраняется.',
+    'Error:XHR:Fail' => 'Не удалось загрузить данные. Пожалуйста, свяжитесь с вашим администратором %1$s.',
+    'Error:HTTP:GetHelp' => 'Пожалуйста, свяжитесь с вашим администратором %1$s, если проблема сохраняется.',
     'Portal:ErrorUserLoggedOut' => 'You are logged out and need to log in again in order to continue.~~',
     'Portal:Datatables:Language:Processing' => 'Пожалуйста, подождите...',
     'Portal:Datatables:Language:Search' => 'Фильтр :',
@@ -58,8 +58,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
     'Brick:Portal:UserProfile:Password:Title' => 'Пароль',
     'Brick:Portal:UserProfile:Password:ChoosePassword' => 'Введите новый пароль',
     'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Подтвердите новый пароль',
-    'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Пожалуйста, свяжитесь с вашим администратором iTop для изменения пароля.',
-    'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Не удалось изменить пароль, пожалуйста, свяжитесь с вашим администратором iTop.',
+    'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Пожалуйста, свяжитесь с вашим администратором %1$s для изменения пароля.',
+    'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Не удалось изменить пароль, пожалуйста, свяжитесь с вашим администратором %1$s.',
     'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Персональная информация',
     'Brick:Portal:UserProfile:Photo:Title' => 'Фотография',
 ));

datamodels/2.x/itop-tickets/cs.dict.itop-tickets.php

@@ -242,7 +242,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
     'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR',
 
     'portal:itop-portal' => 'Standardní portál', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-    'Page:DefaultTitle' => 'iTop - Uživatelský portál',
+    'Page:DefaultTitle' => '%1$s - Uživatelský portál',
     'Brick:Portal:UserProfile:Title' => 'Můj profil',
     'Brick:Portal:NewRequest:Title' => 'Nový požadavek',
     'Brick:Portal:NewRequest:Title+' => '<p>Potřebujete pomoci?</p><p>Vyberte z katalogu služeb a vytvořte nový požadavek.</p>',

datamodels/2.x/itop-tickets/de.dict.itop-tickets.php

@@ -207,6 +207,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Ticket/Attribute:operational_status/Value:resolved+' => '',
 	'Class:Ticket/Attribute:operational_status/Value:closed' => 'Geschlossen',
 	'Class:Ticket/Attribute:operational_status/Value:closed+' => '',
-	'Page:DefaultTitle' => 'iTop - Benutzer Portal',
+	'Page:DefaultTitle' => '%1$s - Benutzer Portal',
 	));
 ?>

datamodels/2.x/itop-tickets/en.dict.itop-tickets.php

@@ -244,7 +244,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR',
 
 	'portal:itop-portal' => 'Standard portal', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => 'iTop - User portal',
+	'Page:DefaultTitle' => '%1$s - User portal',
 	'Brick:Portal:UserProfile:Title' => 'My profile',
 	'Brick:Portal:NewRequest:Title' => 'New request',
 	'Brick:Portal:NewRequest:Title+' => '<p>Need help?</p><p>Pick from the services catalog and submit your request to our support teams.</p>',

datamodels/2.x/itop-tickets/es_cr.dict.itop-tickets.php

@@ -232,7 +232,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 	'portal:itop-portal' => 'Portal estándar',
-	'Page:DefaultTitle' => 'ITop - Portal de usuarios',
+	'Page:DefaultTitle' => '%1$s - Portal de usuarios',
 	'Brick:Portal:UserProfile:Title' => 'Mi perfil',
 	'Brick:Portal:NewRequest:Title' => 'Nueva solicitud',
 	'Brick:Portal:NewRequest:Title+' => '¿Necesita ayuda? Elija del catálogo de servicios y envíe su solicitud a nuestros equipos de soporte.',

datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php

@@ -230,7 +230,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Objectif calculé à partir d\'un SLT de type TTR',
 
 	'portal:itop-portal' => 'Portail standard', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => 'iTop - Portail utilisateur',
+	'Page:DefaultTitle' => '%1$s - Portail utilisateur',
 	'Brick:Portal:UserProfile:Title' => 'Mon profil',
 	'Brick:Portal:NewRequest:Title' => 'Nouvelle requête',
 	'Brick:Portal:NewRequest:Title+' => '<p>Besoin d\'assistance&nbsp;?</p><p>Choisissez un service (assistance ou dépannage) et soumettez votre requête à nos équipes de support.</p>',

datamodels/2.x/itop-tickets/nl.dict.itop-tickets.php

@@ -182,58 +182,58 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'WorkOrder:Details' => 'Details',
 	'WorkOrder:Moreinfo' => 'Meer informatie',
 
-	'Ticket:ImpactAnalysis' => 'Impact Analysis~~',
-	'Class:lnkContactToTicket/Attribute:role_code' => 'Role~~',
-	'Class:lnkContactToTicket/Attribute:role_code/Value:manual' => 'Added manually~~',
-	'Class:lnkContactToTicket/Attribute:role_code/Value:computed' => 'Computed~~',
-	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Do not notify~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
-	'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s~~',
-	'Class:cmdbAbstractObject/Method:Set' => 'Set~~',
-	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Value~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'The value to set~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Set a field with the current date and time~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Set a field with the currently logged in user~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the \"person\" attached to the logged in \"user\").~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Set a field with the time (seconds) elapsed since a date given by another field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to \"DefaultWorkingTimeComputer\" to force a 24x7 scheme~~',
-	'Class:cmdbAbstractObject/Method:Reset' => 'Reset~~',
-	'Class:cmdbAbstractObject/Method:Reset+' => 'Reset a field to its default value~~',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'The field to reset, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Copy' => 'Copy~~',
-	'Class:cmdbAbstractObject/Method:Copy+' => 'Copy the value of a field to another field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Source Field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'The field to get the value from, in the current object~~',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Time To Own~~',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
+	'Ticket:ImpactAnalysis' => 'Impact Analysis~~',
+	'Class:lnkContactToTicket/Attribute:role_code' => 'Role~~',
+	'Class:lnkContactToTicket/Attribute:role_code/Value:manual' => 'Added manually~~',
+	'Class:lnkContactToTicket/Attribute:role_code/Value:computed' => 'Computed~~',
+	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Do not notify~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
+	'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s~~',
+	'Class:cmdbAbstractObject/Method:Set' => 'Set~~',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Set a field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Set a field with the currently logged in user~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the \"person\" attached to the logged in \"user\").~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Set a field with the time (seconds) elapsed since a date given by another field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to \"DefaultWorkingTimeComputer\" to force a 24x7 scheme~~',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Reset~~',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Reset a field to its default value~~',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'The field to reset, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Copy~~',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Copy the value of a field to another field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Source Field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'The field to get the value from, in the current object~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Time To Own~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 	'portal:itop-portal' => 'Standaard portaal', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => 'iTop - Gebruikersportaal',
+	'Page:DefaultTitle' => '%1$s - Gebruikersportaal',
 	'Brick:Portal:UserProfile:Title' => 'Mijn profiel',
 	'Brick:Portal:NewRequest:Title' => 'Nieuw verzoek',
 	'Brick:Portal:NewRequest:Title+' => '<p>Hulp nodig?</p><p>Selecteer de categorie uit de dienstencatalogus en verstuur uw verzoek naar onze support teams.</p>',

datamodels/2.x/itop-tickets/ru.dict.itop-tickets.php

@@ -215,7 +215,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 
 	'portal:itop-portal' => 'Пользовательский портал', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => 'iTop - Пользовательский портал',
+	'Page:DefaultTitle' => '%1$s - Пользовательский портал',
 	'Brick:Portal:UserProfile:Title' => 'Мой профиль',
 	'Brick:Portal:NewRequest:Title' => 'Новый запрос',
 	'Brick:Portal:NewRequest:Title+' => '<p>Нужна помощь?</p><p>Выберите услугу из&nbsp;каталога и&nbsp;отправьте свой запрос команде поддержки.</p>',