N°313 Show product name on branding logo title instead of a generic "iTop" text.

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

application/itopwebpage.class.inc.php

@@ -993,12 +993,12 @@ EOF
 		if (ITOP_REVISION == '$WCREV$')
 		{
 			// This is NOT a version built using the buil system, just display the main version
-			$sVersionString = Dict::Format('UI:iTopVersion:Short', ITOP_VERSION);
+			$sVersionString = Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION);
 		}
 		else
 		{
 			// This is a build made from SVN, let display the full information
-			$sVersionString = Dict::Format('UI:iTopVersion:Long', ITOP_VERSION, ITOP_REVISION, ITOP_BUILD_DATE);
+			$sVersionString = Dict::Format('UI:iTopVersion:Long', ITOP_APPLICATION, ITOP_VERSION, ITOP_REVISION, ITOP_BUILD_DATE);
 		}
 
 		// Render the text of the global search form

application/loginwebpage.class.inc.php

@@ -95,7 +95,7 @@ class LoginWebPage extends NiceWebPage
 			$sLogo = 'itop-logo-external.png';
 			$sBrandingLogo = 'login-logo.png';
 		}
-		$sVersionShort = Dict::Format('UI:iTopVersion:Short', ITOP_VERSION);
+		$sVersionShort = Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION);
 		$sIconUrl = Utils::GetConfig()->Get('app_icon_url');
 		$sDisplayIcon = utils::GetAbsoluteUrlAppRoot().'images/'.$sLogo.'?itopversion='.ITOP_VERSION;
 		if (file_exists(MODULESROOT.'branding/'.$sBrandingLogo))
@@ -117,7 +117,7 @@ class LoginWebPage extends NiceWebPage
 			
 			case 'basic':
 			case 'url':
-			$this->add_header('WWW-Authenticate: Basic realm="'.Dict::Format('UI:iTopVersion:Short', ITOP_VERSION));
+			$this->add_header('WWW-Authenticate: Basic realm="'.Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION));
 			$this->add_header('HTTP/1.0 401 Unauthorized');
 			$this->add_header('Content-type: text/html; charset=iso-8859-1');
 			// Note: displayed when the user will click on Cancel
@@ -602,7 +602,7 @@ EOF
 			}
 			if (($iOnExit == self::EXIT_HTTP_401) || ($sLoginMode == 'basic'))
 			{
-				header('WWW-Authenticate: Basic realm="'.Dict::Format('UI:iTopVersion:Short', ITOP_VERSION));
+				header('WWW-Authenticate: Basic realm="'.Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION));
 				header('HTTP/1.0 401 Unauthorized');
 				header('Content-type: text/html; charset=iso-8859-1');
 				exit;
@@ -634,7 +634,7 @@ EOF
 				self::ResetSession();
 				if (($iOnExit == self::EXIT_HTTP_401) || ($sLoginMode == 'basic'))
 				{
-					header('WWW-Authenticate: Basic realm="'.Dict::Format('UI:iTopVersion:Short', ITOP_VERSION));
+					header('WWW-Authenticate: Basic realm="'.Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION));
 					header('HTTP/1.0 401 Unauthorized');
 					header('Content-type: text/html; charset=iso-8859-1');
 					exit;

dictionaries/cs.dictionary.itop.ui.php

@@ -949,8 +949,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
     'Menu:UserAccountsMenu+' => 'Uživatelské účty',
     'Menu:UserAccountsMenu:Title' => 'Uživatelské účty',
 
-    'UI:iTopVersion:Short' => 'iTop verze %1$s',
-    'UI:iTopVersion:Long' => 'iTop verze %1$s-%2$s ze dne %3$s',
+    'UI:iTopVersion:Short' => '%1$s verze %2$s',
+    'UI:iTopVersion:Long' => '%1$s verze %2$s-%3$s ze dne %4$s',
     'UI:PropertiesTab' => 'Vlastnosti',
 
     'UI:OpenDocumentInNewWindow_' => 'Otevřít tento dokument v novém okně: %1$s',

dictionaries/da.dictionary.itop.ui.php

@@ -776,8 +776,8 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'Menu:UserAccountsMenu' => 'Bruger konti',
 	'Menu:UserAccountsMenu+' => '',
 	'Menu:UserAccountsMenu:Title' => 'Bruger konti',
-	'UI:iTopVersion:Short' => 'iTop version %1$s',
-	'UI:iTopVersion:Long' => 'iTop version %1$s-%2$s built on %3$s',
+	'UI:iTopVersion:Short' => '%1$s version %2$s',
+	'UI:iTopVersion:Long' => '%1$s version %2$s-%3$s built on %4$s',
 	'UI:PropertiesTab' => 'Egenskaber',
 	'UI:OpenDocumentInNewWindow_' => 'Åbn dette dokument i et nyt vindue: %1$s',
 	'UI:DownloadDocument_' => 'Hent dette dokument: %1$s',

dictionaries/de.dictionary.itop.ui.php

@@ -771,8 +771,8 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'Menu:UserAccountsMenu' => 'Benutzerkonten', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:UserAccountsMenu+' => 'Benutzerkonten', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:UserAccountsMenu:Title' => 'Benutzerkonten', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:iTopVersion:Short' => 'iTop Version %1$s',
-	'UI:iTopVersion:Long' => 'iTop Version %1$s-%2$s compiliert am %3$s',
+	'UI:iTopVersion:Short' => '%1$s Version %2$s',
+	'UI:iTopVersion:Long' => '%1$s Version %2$s-%3$s compiliert am %4$s',
 	'UI:PropertiesTab' => 'Eigenschaften',
 	'UI:OpenDocumentInNewWindow_' => 'Dieses Dokument in einem neuen Fenster öffnen: %1$s',
 	'UI:DownloadDocument_' => 'Dieses Dokument herunterladen: %1$s',

dictionaries/dictionary.itop.ui.php

@@ -962,8 +962,8 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'Menu:UserAccountsMenu+' => 'User Accounts', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:UserAccountsMenu:Title' => 'User Accounts', // Duplicated into itop-welcome-itil (will be removed from here...)	
 
-	'UI:iTopVersion:Short' => 'iTop version %1$s',
-	'UI:iTopVersion:Long' => 'iTop version %1$s-%2$s built on %3$s',
+	'UI:iTopVersion:Short' => '%1$s version %2$s',
+	'UI:iTopVersion:Long' => '%1$s version %2$s-%3$s built on %4$s',
 	'UI:PropertiesTab' => 'Properties',
 
 	'UI:OpenDocumentInNewWindow_' => 'Open this document in a new window: %1$s',

dictionaries/es_cr.dictionary.itop.ui.php

@@ -948,8 +948,8 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'Menu:UserAccountsMenu+' => 'Cuentas de Usuario', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:UserAccountsMenu:Title' => 'Cuentas de Usuario', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'UI:iTopVersion:Short' => 'iTop versión %1$s',
-	'UI:iTopVersion:Long' => 'iTop versión %1$s-%2$s compilada en %3$s',
+	'UI:iTopVersion:Short' => '%1$s versión %2$s',
+	'UI:iTopVersion:Long' => '%1$s versión %2$s-%3$s compilada en %4$s',
 	'UI:PropertiesTab' => 'Propiedades',
 
 	'UI:OpenDocumentInNewWindow_' => 'Abra este documento en una ventana nueva: %1$s',

dictionaries/fr.dictionary.itop.ui.php

@@ -828,8 +828,8 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'Menu:UserAccountsMenu' => 'Comptes Utilisateurs', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:UserAccountsMenu+' => 'Comptes Utilisateurs', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:UserAccountsMenu:Title' => 'Comptes Utilisateurs', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:iTopVersion:Short' => 'iTop version %1$s',
-	'UI:iTopVersion:Long' => 'iTop version %1$s-%2$s du %3$s',
+	'UI:iTopVersion:Short' => '%1$s version %2$s',
+	'UI:iTopVersion:Long' => '%1$s version %2$s-%3$s du %4$s',
 	'UI:PropertiesTab' => 'Propriétés',
 	'UI:OpenDocumentInNewWindow_' => 'Ouvrir ce document dans une autre fenêtre: %1$s',
 	'UI:DownloadDocument_' => 'Télécharger ce document: %1$s',

dictionaries/hu.dictionary.itop.ui.php

@@ -699,8 +699,8 @@ Akció kiváltó okhoz rendelésekor kap egy sorszámot , amely meghatározza az
 	'Menu:UserAccountsMenu' => 'Felhasználói fiókok', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:UserAccountsMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:UserAccountsMenu:Title' => 'Felhasználói fiókok', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:iTopVersion:Short' => 'iTop verzió: %1$s',
-	'UI:iTopVersion:Long' => 'iTop verzió: %1$s-%2$s %3$s',
+	'UI:iTopVersion:Short' => '%1$s verzió: %2$s',
+	'UI:iTopVersion:Long' => '%1$s verzió: %2$s-%3$s %4$s',
 	'UI:PropertiesTab' => 'Tulajdonságok',
 	'UI:OpenDocumentInNewWindow_' => 'A követekező dokumentum megnyitása új ablakban: %1$s',
 	'UI:DownloadDocument_' => 'A következő dokuemntum letöltése: %1$s',

dictionaries/it.dictionary.itop.ui.php

@@ -833,8 +833,8 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'Menu:UserAccountsMenu' => 'Account utente', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:UserAccountsMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:UserAccountsMenu:Title' => 'Account utente', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:iTopVersion:Short' => 'Versione iTop %1$s',
-	'UI:iTopVersion:Long' => 'Versione iTop %1$s-%2$s costruita il %3$s',
+	'UI:iTopVersion:Short' => 'Versione %1$s %2$s',
+	'UI:iTopVersion:Long' => 'Versione %1$s %2$s-%3$s costruita il %4$s',
 	'UI:PropertiesTab' => 'Proprietà',
 	'UI:OpenDocumentInNewWindow_' => 'Apri questo documento in una nuova finestra: %1$s',
 	'UI:DownloadDocument_' => 'Scarica questo documento: %1$s',

dictionaries/ja.dictionary.itop.ui.php

@@ -773,8 +773,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Menu:UserAccountsMenu' => 'ユーザアカウント', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:UserAccountsMenu+' => 'ユーザアカウント', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:UserAccountsMenu:Title' => 'ユーザアカウント', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:iTopVersion:Short' => 'iTopバージョン%1$s',
-	'UI:iTopVersion:Long' => 'iTopバージョン%1$s-%2$s ビルド%3$s',
+	'UI:iTopVersion:Short' => '%1$sバージョン%2$s',
+	'UI:iTopVersion:Long' => '%1$sバージョン%2$s-%3$s ビルド%4$s',
 	'UI:PropertiesTab' => 'プロパティ',
 	'UI:OpenDocumentInNewWindow_' => '新規ウィンドウでこ文章を開く: %1$s',
 	'UI:DownloadDocument_' => 'この文書をダウンロードする: %1$s',

dictionaries/nl.dictionary.itop.ui.php

@@ -956,8 +956,8 @@ Indien gekoppeld aan een Trigger, wordt aan elke actie een "orde" nummer gegeven
 	'Menu:UserAccountsMenu+' => 'Gebruikersaccounts',
 	'Menu:UserAccountsMenu:Title' => 'Gebruikersaccounts',	
 
-	'UI:iTopVersion:Short' => 'iTop versie %1$s',
-	'UI:iTopVersion:Long' => 'iTop versie %1$s-%2$s built on %3$s',
+	'UI:iTopVersion:Short' => '%1$s versie %2$s',
+	'UI:iTopVersion:Long' => '%1$s versie %2$s-%3$s built on %4$s',
 	'UI:PropertiesTab' => 'Eigenschappen',
 
 	'UI:OpenDocumentInNewWindow_' => 'Open dit document in een nieuwe window: %1$s',

dictionaries/pt_br.dictionary.itop.ui.php

@@ -948,8 +948,8 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'Menu:UserAccountsMenu+' => 'Contas usuários', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:UserAccountsMenu:Title' => 'Contas usuários',	 // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'UI:iTopVersion:Short' => 'Versão %1$s',
-	'UI:iTopVersion:Long' => 'Versão %1$s-%2$s construído %3$s',
+	'UI:iTopVersion:Short' => '%1$s versão %2$s',
+	'UI:iTopVersion:Long' => '%1$s versão %2$s-%3$s construído %4$s',
 	'UI:PropertiesTab' => 'Propriedades',
 
 	'UI:OpenDocumentInNewWindow_' => 'Abrir este documento em uma nova janela: %1$s',

dictionaries/ru.dictionary.itop.ui.php

@@ -937,8 +937,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Menu:UserAccountsMenu+' => 'Учетные записи пользователей', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:UserAccountsMenu:Title' => 'Учетные записи пользователей', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'UI:iTopVersion:Short' => 'iTop версия %1$s',
-	'UI:iTopVersion:Long' => 'iTop версия %1$s-%2$s основан на %3$s',
+	'UI:iTopVersion:Short' => '%1$s версия %2$s',
+	'UI:iTopVersion:Long' => '%1$s версия %2$s-%3$s основан на %4$s',
 	'UI:PropertiesTab' => 'Свойства',
 
 	'UI:OpenDocumentInNewWindow_' => 'Открыть этот документ в новом окне: %1$s',

dictionaries/tr.dictionary.itop.ui.php

@@ -828,8 +828,8 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'Menu:UserAccountsMenu+' => 'Kullanıcı Hesapları', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:UserAccountsMenu:Title' => 'Kullanıcı Hesapları', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'UI:iTopVersion:Short' => 'iTop versiyonu %1$s',
-	'UI:iTopVersion:Long' => 'iTop  %3$s tarihli versiyonu %1$s-%2$s',
+	'UI:iTopVersion:Short' => '%1$s versiyonu %2$s',
+	'UI:iTopVersion:Long' => '%1$s  %4$s tarihli versiyonu %2$s-%3$s',
 	'UI:PropertiesTab' => 'Özellikler',
 
 	'UI:OpenDocumentInNewWindow_' => 'Dokümanı yeni pencerede aç: %1$s',

dictionaries/zh.dictionary.itop.ui.php

@@ -827,8 +827,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:UserAccountsMenu+' => '用户帐户', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:UserAccountsMenu:Title' => '用户帐户',	 // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'UI:iTopVersion:Short' => 'iTop version %1$s',
-	'UI:iTopVersion:Long' => 'iTop version %1$s-%2$s built on %3$s',
+	'UI:iTopVersion:Short' => '%1$s version %2$s',
+	'UI:iTopVersion:Long' => '%1$s version %2$s-%3$s built on %4$s',
 	'UI:PropertiesTab' => '属性',
 
 	'UI:OpenDocumentInNewWindow_' => '在新窗口打开文档: %1$s',

pages/ajax.render.php

@@ -1151,7 +1151,7 @@ $("#collapse_support_details").click(function() {
 $('#support_details').toggle();
 EOF
 		);
-		$sVersionString = Dict::Format('UI:iTopVersion:Long', ITOP_VERSION, ITOP_REVISION, ITOP_BUILD_DATE);
+		$sVersionString = Dict::Format('UI:iTopVersion:Long', ITOP_APPLICATION, ITOP_VERSION, ITOP_REVISION, ITOP_BUILD_DATE);
 		$sMySQLVersion = CMDBSource::GetDBVersion();
 		$sPHPVersion = phpversion();
 		$sOSVersion = PHP_OS;