Forráskód Böngészése

Rework of the dictionaries: moved menu related entries to the module itop-welcome-itil (which does create most of those menus), while preserving the original copy of the entries so as to be compatible with customizations made with a copy of an older version of itop-welcome-itil

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3453 a333f486-631f-4898-b8df-5754b55c2be0
romainq 10 éve
szülő
commit
0c8093e2f5
32 módosított fájl, 1057 hozzáadás és 431 törlés
  1. 2 0
      datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php
  2. 61 0
      datamodels/2.x/itop-welcome-itil/de.dict.itop-welcome-itil.php
  3. 62 0
      datamodels/2.x/itop-welcome-itil/en.dict.itop-welcome-itil.php
  4. 62 0
      datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php
  5. 62 0
      datamodels/2.x/itop-welcome-itil/fr.dict.itop-welcome-itil.php
  6. 59 0
      datamodels/2.x/itop-welcome-itil/hu.dict.itop-welcome-itil.php
  7. 59 0
      datamodels/2.x/itop-welcome-itil/it.dict.itop-welcome-itil.php
  8. 62 0
      datamodels/2.x/itop-welcome-itil/ja.dict.itop-welcome-itil.php
  9. 62 0
      datamodels/2.x/itop-welcome-itil/pt_br.dict.itop-welcome-itil.php
  10. 62 0
      datamodels/2.x/itop-welcome-itil/ru.dict.itop-welcome-itil.php
  11. 57 0
      datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php
  12. 57 0
      datamodels/2.x/itop-welcome-itil/zh.dict.itop-welcome-itil.php
  13. 2 2
      dictionaries/de.dictionary.itop.core.php
  14. 34 37
      dictionaries/de.dictionary.itop.ui.php
  15. 2 2
      dictionaries/dictionary.itop.core.php
  16. 35 39
      dictionaries/dictionary.itop.ui.php
  17. 2 2
      dictionaries/es_cr.dictionary.itop.core.php
  18. 35 39
      dictionaries/es_cr.dictionary.itop.ui.php
  19. 2 2
      dictionaries/fr.dictionary.itop.core.php
  20. 35 38
      dictionaries/fr.dictionary.itop.ui.php
  21. 2 2
      dictionaries/hu.dictionary.itop.core.php
  22. 32 35
      dictionaries/hu.dictionary.itop.ui.php
  23. 2 2
      dictionaries/it.dictionary.itop.core.php
  24. 32 35
      dictionaries/it.dictionary.itop.ui.php
  25. 2 4
      dictionaries/ja.dictionary.itop.core.php
  26. 35 38
      dictionaries/ja.dictionary.itop.ui.php
  27. 2 2
      dictionaries/pt_br.dictionary.itop.core.php
  28. 35 39
      dictionaries/pt_br.dictionary.itop.ui.php
  29. 2 2
      dictionaries/ru.dictionary.itop.core.php
  30. 35 39
      dictionaries/ru.dictionary.itop.ui.php
  31. 32 36
      dictionaries/tr.dictionary.itop.ui.php
  32. 32 36
      dictionaries/zh.dictionary.itop.ui.php

+ 2 - 0
datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php

@@ -1085,6 +1085,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Menu:Typology+' => 'トポロジー構成',
 	'Menu:Software' => 'ソフトウエアカタログ',
 	'Menu:Software+' => 'ソフトウエアカタログ',
+	'Menu:OSVersion' => 'OS バージョン',
+	'Menu:OSVersion+' => '',
 	'UI_WelcomeMenu_AllConfigItems' => 'サマリー',
 	'Menu:ConfigManagement:Typology' => '分類構成',
 	'Server:baseinfo' => '基本情報',

+ 61 - 0
datamodels/2.x/itop-welcome-itil/de.dict.itop-welcome-itil.php

@@ -0,0 +1,61 @@
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2014 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Menu:DataSources' => 'Datenquellen für die Synchronisation',
+	'Menu:DataSources+' => 'Alle Datenquellen für die Synchronisation',
+	'Menu:WelcomeMenu' => 'Willkommen',
+	'Menu:WelcomeMenu+' => 'Willkommen bei iTop',
+	'Menu:WelcomeMenuPage' => 'Willkommen',
+	'Menu:WelcomeMenuPage+' => 'Willkommen bei iTop',
+	'Menu:AdminTools' => 'Admin-Tools',
+	'Menu:AdminTools+' => 'Administrationswerkzeuge',
+	'Menu:AdminTools?' => 'Werkzeuge, die nur für Benutzer mit Adminstratorprofil zugänglich sind',
+	'Menu:CSVImportMenu' => 'CSV-Import',
+	'Menu:CSVImportMenu+' => 'Massenerstellung oder -aktualisierung',
+	'Menu:DataModelMenu' => 'Datenmodell',
+	'Menu:DataModelMenu+' => 'Übersicht des Datenmodells',
+	'Menu:ExportMenu' => 'Export',
+	'Menu:ExportMenu+' => 'Export einer beliebigen Abfrage in HTML, CSV oder XML',
+	'Menu:NotificationsMenu' => 'Benachrichtigungen',
+	'Menu:NotificationsMenu+' => 'Einstellungen der Benachrichtigungen',
+	'Menu:AuditCategories' => 'Audit-Kategorien',
+	'Menu:AuditCategories+' => 'Audit-Kategorien',
+	'Menu:Notifications:Title' => 'Audit-Kategorien',
+	'Menu:RunQueriesMenu' => 'Abfrage ausführen',
+	'Menu:RunQueriesMenu+' => 'Eine beliebige Abfrage ausführen',
+	'Menu:QueryMenu' => 'Query-Bibliothek',
+	'Menu:QueryMenu+' => '',
+	'Menu:DataAdministration' => 'Data Management',
+	'Menu:DataAdministration+' => 'Data Management',
+	'Menu:UniversalSearchMenu' => 'Universelle Suche',
+	'Menu:UniversalSearchMenu+' => 'Suchen Sie nach beliebigen Inhalt...',
+	'Menu:UserManagementMenu' => 'User-Management',
+	'Menu:UserManagementMenu+' => 'User-Management',
+	'Menu:ProfilesMenu' => 'Profile',
+	'Menu:ProfilesMenu+' => 'Profile',
+	'Menu:ProfilesMenu:Title' => 'Profile',
+	'Menu:UserAccountsMenu' => 'Benutzerkonten',
+	'Menu:UserAccountsMenu+' => 'Benutzerkonten',
+	'Menu:UserAccountsMenu:Title' => 'Benutzerkonten',
+));

+ 62 - 0
datamodels/2.x/itop-welcome-itil/en.dict.itop-welcome-itil.php

@@ -0,0 +1,62 @@
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2014 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Menu:DataSources' => 'Synchronization Data Sources',
+	'Menu:DataSources+' => 'All Synchronization Data Sources',
+	'Menu:WelcomeMenu' => 'Welcome',
+	'Menu:WelcomeMenu+' => 'Welcome to iTop',
+	'Menu:WelcomeMenuPage' => 'Welcome',
+	'Menu:WelcomeMenuPage+' => 'Welcome to iTop',
+	'Menu:AdminTools' => 'Admin tools',
+	'Menu:AdminTools+' => 'Administration tools',
+	'Menu:AdminTools?' => 'Tools accessible only to users having the administrator profile',
+	'Menu:CSVImportMenu' => 'CSV import',
+	'Menu:CSVImportMenu+' => 'Bulk creation or update',
+	'Menu:DataModelMenu' => 'Data Model',
+	'Menu:DataModelMenu+' => 'Overview of the Data Model',
+	'Menu:ExportMenu' => 'Export',
+	'Menu:ExportMenu+' => 'Export the results of any query in HTML, CSV or XML',
+	'Menu:NotificationsMenu' => 'Notifications',
+	'Menu:NotificationsMenu+' => 'Configuration of the Notifications',
+	'Menu:AuditCategories' => 'Audit Categories',
+	'Menu:AuditCategories+' => 'Audit Categories',
+	'Menu:Notifications:Title' => 'Audit Categories',
+	'Menu:RunQueriesMenu' => 'Run Queries',
+	'Menu:RunQueriesMenu+' => 'Run any query',
+	'Menu:QueryMenu' => 'Query phrasebook',
+	'Menu:QueryMenu+' => 'Query phrasebook',
+	'Menu:DataAdministration' => 'Data administration',
+	'Menu:DataAdministration+' => 'Data administration',
+	'Menu:UniversalSearchMenu' => 'Universal Search',
+	'Menu:UniversalSearchMenu+' => 'Search for anything...',
+	'Menu:UserManagementMenu' => 'User Management',
+	'Menu:UserManagementMenu+' => 'User management',
+	'Menu:ProfilesMenu' => 'Profiles',
+	'Menu:ProfilesMenu+' => 'Profiles',
+	'Menu:ProfilesMenu:Title' => 'Profiles',
+	'Menu:UserAccountsMenu' => 'User Accounts',
+	'Menu:UserAccountsMenu+' => 'User Accounts',
+	'Menu:UserAccountsMenu:Title' => 'User Accounts',
+	'Menu:MyShortcuts' => 'My Shortcuts',
+));

+ 62 - 0
datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php

@@ -0,0 +1,62 @@
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2014 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'Menu:DataSources' => 'Fuentes de Datos Sincronizables',
+	'Menu:DataSources+' => 'Fuentes de Datos Sincronizables',
+	'Menu:WelcomeMenu' => 'Bienvenido',
+	'Menu:WelcomeMenu+' => 'Bienvenido a iTop',
+	'Menu:WelcomeMenuPage' => 'Bienvenido',
+	'Menu:WelcomeMenuPage+' => 'Bienvenido a iTop',
+	'Menu:AdminTools' => 'Herramientas Administrativas',
+	'Menu:AdminTools+' => 'Herramientas Administrativas',
+	'Menu:AdminTools?' => 'Herramientas accesibles sólo a usuarios con Perfil de administrador',
+	'Menu:CSVImportMenu' => 'Importar CSV',
+	'Menu:CSVImportMenu+' => 'Creación o Actualización Másiva',
+	'Menu:DataModelMenu' => 'Modelo de Datos',
+	'Menu:DataModelMenu+' => 'Resumen del Modelo de Datos',
+	'Menu:ExportMenu' => 'Exportar',
+	'Menu:ExportMenu+' => 'Exportar los Resultados de Cualquier Consulta en HTML, CSV o XML',
+	'Menu:NotificationsMenu' => 'Notificaciones',
+	'Menu:NotificationsMenu+' => 'Configuración de las Notificaciones',
+	'Menu:AuditCategories' => 'Auditar Categorías',
+	'Menu:AuditCategories+' => 'Auditar Categorías',
+	'Menu:Notifications:Title' => 'Auditar Categorías',
+	'Menu:RunQueriesMenu' => 'Ejecutar Consultas',
+	'Menu:RunQueriesMenu+' => 'Ejecutar Cualquier Consulta',
+	'Menu:QueryMenu' => 'Libreta de Consultas',
+	'Menu:QueryMenu+' => 'Libreta de Consultas',
+	'Menu:DataAdministration' => 'Administración de Datos',
+	'Menu:DataAdministration+' => 'Administración de Datos',
+	'Menu:UniversalSearchMenu' => 'Búsqueda Universal',
+	'Menu:UniversalSearchMenu+' => 'Buscar cualquier cosa',
+	'Menu:UserManagementMenu' => 'Administración de Usuarios',
+	'Menu:UserManagementMenu+' => 'Administración de Usuarios',
+	'Menu:ProfilesMenu' => 'Perfiles',
+	'Menu:ProfilesMenu+' => 'Perfiles',
+	'Menu:ProfilesMenu:Title' => 'Perfiles',
+	'Menu:UserAccountsMenu' => 'Cuentas de Usuario',
+	'Menu:UserAccountsMenu+' => 'Cuentas de Usuario',
+	'Menu:UserAccountsMenu:Title' => 'Cuentas de Usuario',
+	'Menu:MyShortcuts' => 'Mis Accesos Rápidos',
+));

+ 62 - 0
datamodels/2.x/itop-welcome-itil/fr.dict.itop-welcome-itil.php

@@ -0,0 +1,62 @@
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2014 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Menu:DataSources' => 'Synchronisation',
+	'Menu:DataSources+' => '',
+	'Menu:WelcomeMenu' => 'Bienvenue',
+	'Menu:WelcomeMenu+' => 'Bienvenue dans iTop',
+	'Menu:WelcomeMenuPage' => 'Bienvenue',
+	'Menu:WelcomeMenuPage+' => 'Bienvenue dans iTop',
+	'Menu:AdminTools' => 'Outils d\'admin',
+	'Menu:AdminTools+' => 'Outils d\'administration',
+	'Menu:AdminTools?' => 'Ces outils sont accessibles uniquement aux utilisateurs possédant le profil Administrateur.',
+	'Menu:CSVImportMenu' => 'Import CSV',
+	'Menu:CSVImportMenu+' => 'Import ou mise à jour en masse',
+	'Menu:DataModelMenu' => 'Modèle de Données',
+	'Menu:DataModelMenu+' => 'Résumé du Modèle de Données',
+	'Menu:ExportMenu' => 'Exportation',
+	'Menu:ExportMenu+' => 'Exportation des résultats d\'une requête en HTML, CSV ou XML',
+	'Menu:NotificationsMenu' => 'Notifications',
+	'Menu:NotificationsMenu+' => 'Configuration des Notifications',
+	'Menu:AuditCategories' => 'Catégories d\'audit',
+	'Menu:AuditCategories+' => 'Catégories d\'audit',
+	'Menu:Notifications:Title' => 'Catégories d\'audit',
+	'Menu:RunQueriesMenu' => 'Requêtes OQL',
+	'Menu:RunQueriesMenu+' => 'Executer une requête OQL',
+	'Menu:QueryMenu' => 'Livre des requêtes',
+	'Menu:QueryMenu+' => 'Livre des requêtes',
+	'Menu:DataAdministration' => 'Administration des données',
+	'Menu:DataAdministration+' => 'Administration des données',
+	'Menu:UniversalSearchMenu' => 'Recherche Universelle',
+	'Menu:UniversalSearchMenu+' => 'Rechercher n\'importe quel objet...',
+	'Menu:UserManagementMenu' => 'Gestion des Utilisateurs',
+	'Menu:UserManagementMenu+' => 'Gestion des Utilisateurs',
+	'Menu:ProfilesMenu' => 'Profils',
+	'Menu:ProfilesMenu+' => 'Profils',
+	'Menu:ProfilesMenu:Title' => 'Profils',
+	'Menu:UserAccountsMenu' => 'Comptes Utilisateurs',
+	'Menu:UserAccountsMenu+' => 'Comptes Utilisateurs',
+	'Menu:UserAccountsMenu:Title' => 'Comptes Utilisateurs',
+	'Menu:MyShortcuts' => 'Mes raccourcis',
+));

+ 59 - 0
datamodels/2.x/itop-welcome-itil/hu.dict.itop-welcome-itil.php

@@ -0,0 +1,59 @@
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2014 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Menu:DataSources' => 'Szinkronizált adatforrások',
+	'Menu:DataSources+' => '',
+	'Menu:WelcomeMenu' => 'Üdvözlöm',
+	'Menu:WelcomeMenu+' => '',
+	'Menu:WelcomeMenuPage' => 'Üdvözlöm',
+	'Menu:WelcomeMenuPage+' => '',
+	'Menu:AdminTools' => 'Adminisztrációs eszközök',
+	'Menu:AdminTools+' => '',
+	'Menu:AdminTools?' => 'Eszközök csak az adminisztrátori profilhoz rendlet felhasználók számára elérhetők.',
+	'Menu:CSVImportMenu' => 'CSV import',
+	'Menu:CSVImportMenu+' => '',
+	'Menu:DataModelMenu' => 'Adatmodell',
+	'Menu:DataModelMenu+' => '',
+	'Menu:ExportMenu' => 'Export',
+	'Menu:ExportMenu+' => '',
+	'Menu:NotificationsMenu' => 'Értesítések',
+	'Menu:NotificationsMenu+' => '',
+	'Menu:AuditCategories' => 'Audit kategóriák',
+	'Menu:AuditCategories+' => '',
+	'Menu:Notifications:Title' => 'Audit kategóriák',
+	'Menu:RunQueriesMenu' => 'Lekérdezés futtatás',
+	'Menu:RunQueriesMenu+' => '',
+	'Menu:DataAdministration' => 'Adat adminisztráció',
+	'Menu:DataAdministration+' => '',
+	'Menu:UniversalSearchMenu' => 'Univerzális keresés',
+	'Menu:UniversalSearchMenu+' => '',
+	'Menu:UserManagementMenu' => 'Felhasználó menedzsment',
+	'Menu:UserManagementMenu+' => '',
+	'Menu:ProfilesMenu' => 'Profilok',
+	'Menu:ProfilesMenu+' => '',
+	'Menu:ProfilesMenu:Title' => 'Profilok',
+	'Menu:UserAccountsMenu' => 'Felhasználói fiókok',
+	'Menu:UserAccountsMenu+' => '',
+	'Menu:UserAccountsMenu:Title' => 'Felhasználói fiókok',
+));

+ 59 - 0
datamodels/2.x/itop-welcome-itil/it.dict.itop-welcome-itil.php

@@ -0,0 +1,59 @@
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2014 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Menu:DataSources' => 'Sorgente di sincronizzazione dei dati',
+	'Menu:DataSources+' => '',
+	'Menu:WelcomeMenu' => 'Benveuto',
+	'Menu:WelcomeMenu+' => '',
+	'Menu:WelcomeMenuPage' => 'Benvenuto',
+	'Menu:WelcomeMenuPage+' => '',
+	'Menu:AdminTools' => 'Strumenti di amministrazione',
+	'Menu:AdminTools+' => '',
+	'Menu:AdminTools?' => 'Strumenti accessibile solo agli utenti con il profilo di amministratore',
+	'Menu:CSVImportMenu' =>  'Importazione CSV',
+	'Menu:CSVImportMenu+' => '',
+	'Menu:DataModelMenu' => 'Modello Dati',
+	'Menu:DataModelMenu+' => '',
+	'Menu:ExportMenu' => 'Esporta',
+	'Menu:ExportMenu+' => '',
+	'Menu:NotificationsMenu' =>  'Notifiche',
+	'Menu:NotificationsMenu+' => '',
+	'Menu:AuditCategories' => 'Categorie di Audit',
+	'Menu:AuditCategories+' => '',
+	'Menu:Notifications:Title' => 'Categorie di Audit',
+	'Menu:RunQueriesMenu' => 'Esegui query',
+	'Menu:RunQueriesMenu+' => '',
+	'Menu:DataAdministration' => 'Dati di amministrazione',
+	'Menu:DataAdministration+' => '',
+	'Menu:UniversalSearchMenu' => 'Ricerca universale',
+	'Menu:UniversalSearchMenu+' => '',
+	'Menu:UserManagementMenu' => 'Gestione degli utenti',
+	'Menu:UserManagementMenu+' => '',
+	'Menu:ProfilesMenu' => 'Profili',
+	'Menu:ProfilesMenu+' => '',
+	'Menu:ProfilesMenu:Title' => 'Profili',
+	'Menu:UserAccountsMenu' => 'Account utente',
+	'Menu:UserAccountsMenu+' => '',
+	'Menu:UserAccountsMenu:Title' => 'Account utente',
+));

+ 62 - 0
datamodels/2.x/itop-welcome-itil/ja.dict.itop-welcome-itil.php

@@ -0,0 +1,62 @@
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2014 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Menu:DataSources' => '同期データソース',
+	'Menu:DataSources+' => '全ての同期データソース',
+	'Menu:WelcomeMenu' => 'ようこそ',
+	'Menu:WelcomeMenu+' => 'ようこそ、iTopへ',
+	'Menu:WelcomeMenuPage' => 'ようこそ',
+	'Menu:WelcomeMenuPage+' => 'ようこそ、iTopへ',
+	'Menu:AdminTools' => '管理ツール',
+	'Menu:AdminTools+' => '管理ツール',
+	'Menu:AdminTools?' => 'このツールは管理者プロフィールを持つユーザのみアクセスが可能です。',
+	'Menu:CSVImportMenu' => 'CSV インポート',
+	'Menu:CSVImportMenu+' => '一括作成/一括更新',
+	'Menu:DataModelMenu' => 'データモデル',
+	'Menu:DataModelMenu+' => 'データモデル概要',
+	'Menu:ExportMenu' => 'エクスポート',
+	'Menu:ExportMenu+' => '任意のクエリ結果をHTML、CSV、XMLでエクスポートする',
+	'Menu:NotificationsMenu' => '通知',
+	'Menu:NotificationsMenu+' => '通知の設定',
+	'Menu:AuditCategories' => '監査カテゴリ',
+	'Menu:AuditCategories+' => '監査カテゴリ',
+	'Menu:Notifications:Title' => '監査カテゴリ',
+	'Menu:RunQueriesMenu' => 'クエリ実行',
+	'Menu:RunQueriesMenu+' => '任意のクエリを実行',
+	'Menu:QueryMenu' => 'クエリのフレーズブック',
+	'Menu:QueryMenu+' => 'クエリのフレーズブック',
+	'Menu:DataAdministration' => 'データ管理',
+	'Menu:DataAdministration+' => 'データ管理',
+	'Menu:UniversalSearchMenu' => '全検索',
+	'Menu:UniversalSearchMenu+' => '何か...検索',
+	'Menu:UserManagementMenu' => 'ユーザ管理',
+	'Menu:UserManagementMenu+' => 'ユーザ管理',
+	'Menu:ProfilesMenu' => 'プロフィール',
+	'Menu:ProfilesMenu+' => 'プロフィール',
+	'Menu:ProfilesMenu:Title' => 'プロフィール',
+	'Menu:UserAccountsMenu' => 'ユーザアカウント',
+	'Menu:UserAccountsMenu+' => 'ユーザアカウント',
+	'Menu:UserAccountsMenu:Title' => 'ユーザアカウント',
+	'Menu:MyShortcuts' => '私のショートカット',
+));

+ 62 - 0
datamodels/2.x/itop-welcome-itil/pt_br.dict.itop-welcome-itil.php

@@ -0,0 +1,62 @@
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2014 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Menu:DataSources' => 'Fontes de dados de sincronização',
+	'Menu:DataSources+' => 'Todas fontes de dados de sincronização',
+	'Menu:WelcomeMenu' => 'Bem-vindo ao iTop',
+	'Menu:WelcomeMenu+' => 'Bem-vindo ao iTop',
+	'Menu:WelcomeMenuPage' => 'Bem-vindo ao iTop',
+	'Menu:WelcomeMenuPage+' => 'Bem-vindo ao iTop',
+	'Menu:AdminTools' => 'Ferramentas Administrativas',
+	'Menu:AdminTools+' => 'Ferramentas Administrativas',
+	'Menu:AdminTools?' => 'Ferramentas acessíveis apenas para usuários com o perfil do administrador',
+	'Menu:CSVImportMenu' => 'Importar CSV',
+	'Menu:CSVImportMenu+' => 'Criação ou atualização em massa',
+	'Menu:DataModelMenu' => 'Modelo Dados',
+	'Menu:DataModelMenu+' => 'Visão geral do Modelo Dados',
+	'Menu:ExportMenu' => 'Exportar',
+	'Menu:ExportMenu+' => 'Exportar o resultado de qualquer consulta em HTML, CSV ou XML',
+	'Menu:NotificationsMenu' => 'Notificações',
+	'Menu:NotificationsMenu+' => 'Configuração de Notificações',
+	'Menu:AuditCategories' => 'Categoria Auditorias',
+	'Menu:AuditCategories+' => 'Categoria Auditorias',
+	'Menu:Notifications:Title' => 'Categoria Auditorias',
+	'Menu:RunQueriesMenu' => 'Executar consultas',
+	'Menu:RunQueriesMenu+' => 'Executar qualquer consulta',
+	'Menu:QueryMenu' => 'Consulta  definida',
+	'Menu:QueryMenu+' => 'Consulta  definida',
+	'Menu:DataAdministration' => 'Administração Dados',
+	'Menu:DataAdministration+' => 'Administração Dados',
+	'Menu:UniversalSearchMenu' => 'Pesquisa Universal',
+	'Menu:UniversalSearchMenu+' => 'Pesquisar por nada...',
+	'Menu:UserManagementMenu' => 'Gerenciamento Usuários',
+	'Menu:UserManagementMenu+' => 'Gerenciamento Usuários',
+	'Menu:ProfilesMenu' => 'Perfis',
+	'Menu:ProfilesMenu+' => 'Perfis',
+	'Menu:ProfilesMenu:Title' => 'Perfis',
+	'Menu:UserAccountsMenu' => 'Contas usuários',
+	'Menu:UserAccountsMenu+' => 'Contas usuários',
+	'Menu:UserAccountsMenu:Title' => 'Contas usuários',	
+	'Menu:MyShortcuts' => 'Meus atalhos',
+));

+ 62 - 0
datamodels/2.x/itop-welcome-itil/ru.dict.itop-welcome-itil.php

@@ -0,0 +1,62 @@
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2014 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Menu:DataSources' => 'Синхронизация данных',
+	'Menu:DataSources+' => 'Синхронизация данных',
+	'Menu:WelcomeMenu' => 'Добро пожаловать',
+	'Menu:WelcomeMenu+' => 'Добро пожаловать в iTop',
+	'Menu:WelcomeMenuPage' => 'Добро пожаловать',
+	'Menu:WelcomeMenuPage+' => 'Добро пожаловать в iTop',
+	'Menu:AdminTools' => 'Инструменты админа',
+	'Menu:AdminTools+' => 'Административные инструменты',
+	'Menu:AdminTools?' => 'Инструменты доступны только для пользователей, имеющих профиль администратора',
+	'Menu:CSVImportMenu' => 'Импорт CSV',
+	'Menu:CSVImportMenu+' => 'Пакетное создание или обновление',
+	'Menu:DataModelMenu' => 'Модель данных',
+	'Menu:DataModelMenu+' => 'Обзор модели данных',
+	'Menu:ExportMenu' => 'Экспорт',
+	'Menu:ExportMenu+' => 'Экспорт результатов любого запроса в HTML, CSV или XML',
+	'Menu:NotificationsMenu' => 'Уведомления',
+	'Menu:NotificationsMenu+' => 'Конфигурация уведомлений',
+	'Menu:AuditCategories' => 'Категории аудита',
+	'Menu:AuditCategories+' => 'Категории аудита',
+	'Menu:Notifications:Title' => 'Категории аудита',
+	'Menu:RunQueriesMenu' => 'Выполнение запросов',
+	'Menu:RunQueriesMenu+' => 'Выполнение любых запросов',
+	'Menu:QueryMenu' => 'Книга запросов',
+	'Menu:QueryMenu+' => 'Query phrasebook',
+	'Menu:DataAdministration' => 'Административные данные',
+	'Menu:DataAdministration+' => 'Административные данные',
+	'Menu:UniversalSearchMenu' => 'Универсальный поиск',
+	'Menu:UniversalSearchMenu+' => 'Поиск чего угодно...',
+	'Menu:UserManagementMenu' => 'Управление пользователями',
+	'Menu:UserManagementMenu+' => 'Управление пользователями',
+	'Menu:ProfilesMenu' => 'Профили',
+	'Menu:ProfilesMenu+' => 'Профили',
+	'Menu:ProfilesMenu:Title' => 'Профили',
+	'Menu:UserAccountsMenu' => 'Учетные записи пользователей',
+	'Menu:UserAccountsMenu+' => 'Учетные записи пользователей',
+	'Menu:UserAccountsMenu:Title' => 'Учетные записи пользователей',	
+	'Menu:MyShortcuts' => 'Избранное',
+));

+ 57 - 0
datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php

@@ -0,0 +1,57 @@
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2014 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Menu:WelcomeMenu' => 'Hoşgeldiniz',
+	'Menu:WelcomeMenu+' => 'iTop\'a Hoşgeldiniz',
+	'Menu:WelcomeMenuPage' => 'Hoşgeldiniz',
+	'Menu:WelcomeMenuPage+' => 'iTop\'a Hoşgeldiniz',
+	'Menu:AdminTools' => 'Yönetim Araçları',
+	'Menu:AdminTools+' => 'Yönetim Araçları',
+	'Menu:AdminTools?' => 'Yönetici profiline izin verilen araçlar',
+	'Menu:CSVImportMenu' => 'CSV dışardan al',
+	'Menu:CSVImportMenu+' => 'Çoklu yaratım veya güncelleme',
+	'Menu:DataModelMenu' => 'Veri Modeli',
+	'Menu:DataModelMenu+' => 'Veri Modeli Özeti',
+	'Menu:ExportMenu' => 'Dışarı ver',
+	'Menu:ExportMenu+' => 'Sorgu sonucunu HTML, CSV veya XML olarak dışarı aktar',
+	'Menu:NotificationsMenu' => 'Uyarılar',
+	'Menu:NotificationsMenu+' => 'Uyarıların yapılandırılması',
+	'Menu:AuditCategories' => 'Denetleme Kategorileri',
+	'Menu:AuditCategories+' => 'Denetleme Kategorileri',
+	'Menu:Notifications:Title' => 'Denetleme Kategorileri',
+	'Menu:RunQueriesMenu' => 'Sorgu çalıştır',
+	'Menu:RunQueriesMenu+' => 'Sorgu çalıştır',
+	'Menu:DataAdministration' => 'Veri Yönetimi',
+	'Menu:DataAdministration+' => 'Veri Yönetimi',
+	'Menu:UniversalSearchMenu' => 'Genel sorgu',
+	'Menu:UniversalSearchMenu+' => 'Herhangi bir arama...',
+	'Menu:UserManagementMenu' => 'Kullanıcı Yönetimi',
+	'Menu:UserManagementMenu+' => 'Kullanıcı Yönetimi',
+	'Menu:ProfilesMenu' => 'Profiller',
+	'Menu:ProfilesMenu+' => 'Profiller',
+	'Menu:ProfilesMenu:Title' => 'Profiller',
+	'Menu:UserAccountsMenu' => 'Kullanıcı Hesapları',
+	'Menu:UserAccountsMenu+' => 'Kullanıcı Hesapları',
+	'Menu:UserAccountsMenu:Title' => 'Kullanıcı Hesapları',
+));

+ 57 - 0
datamodels/2.x/itop-welcome-itil/zh.dict.itop-welcome-itil.php

@@ -0,0 +1,57 @@
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2014 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Menu:WelcomeMenu' => '欢迎',
+	'Menu:WelcomeMenu+' => '欢迎来到iTop',
+	'Menu:WelcomeMenuPage' => '欢迎',
+	'Menu:WelcomeMenuPage+' => '欢迎来到iTop',
+	'Menu:AdminTools' => '管理工具',
+	'Menu:AdminTools+' => '管理工具',
+	'Menu:AdminTools?' => '具有系统管理员简档的用户才能获得的工具',
+	'Menu:CSVImportMenu' => 'CSV 导入',
+	'Menu:CSVImportMenu+' => '大批量创建或修改',
+	'Menu:DataModelMenu' => '数据模型',
+	'Menu:DataModelMenu+' => '数据模型概览',
+	'Menu:ExportMenu' => '导出',
+	'Menu:ExportMenu+' => '以HTML, CSV or XML格式导出任何查询的结果',
+	'Menu:NotificationsMenu' => '通知',
+	'Menu:NotificationsMenu+' => '通知的配置',
+	'Menu:AuditCategories' => '审计类目',
+	'Menu:AuditCategories+' => '审计类目',
+	'Menu:Notifications:Title' => '审计类目',
+	'Menu:RunQueriesMenu' => '运行查询',
+	'Menu:RunQueriesMenu+' => '运行任何查询',
+	'Menu:DataAdministration' => '数据管理',
+	'Menu:DataAdministration+' => '数据管理',
+	'Menu:UniversalSearchMenu' => '通用搜索',
+	'Menu:UniversalSearchMenu+' => '搜索所有...',
+	'Menu:UserManagementMenu' => '用户管理',
+	'Menu:UserManagementMenu+' => '用户管理',
+	'Menu:ProfilesMenu' => '简档',
+	'Menu:ProfilesMenu+' => '简档',
+	'Menu:ProfilesMenu:Title' => '简档',
+	'Menu:UserAccountsMenu' => '用户帐户',
+	'Menu:UserAccountsMenu+' => '用户帐户',
+	'Menu:UserAccountsMenu:Title' => '用户帐户',
+));

+ 2 - 2
dictionaries/de.dictionary.itop.core.php

@@ -477,8 +477,8 @@ Operatoren:<br/>
 	'Core:Synchro:NeverRun' => 'Synchronisation noch nicht erfolgt. Kein Protokoll verfügbar.',
 	'Core:Synchro:SynchroEndedOn_Date' => 'Die letzte Synchronisation endete um %1$s.',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Die Synchronisation, die um %1$s gestartet wurde, läuft noch ...',
-	'Menu:DataSources' => 'Datenquellen für die Synchronisation',
-	'Menu:DataSources+' => 'Alle Datenquellen für die Synchronisation',
+	'Menu:DataSources' => 'Datenquellen für die Synchronisation', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => 'Alle Datenquellen für die Synchronisation', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Ignoriert (%1$s)',
 	'Core:Synchro:label_repl_disappeared' => 'Verschwunden (%1$s)',
 	'Core:Synchro:label_repl_existing' => 'Vorhanden (%1$s)',

+ 34 - 37
dictionaries/de.dictionary.itop.ui.php

@@ -196,10 +196,10 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:URP_AttributeGrant/Attribute:attcode+' => 'Attribut-Code',
 	'BooleanLabel:yes' => 'Ja',
 	'BooleanLabel:no' => 'Nein',
-	'Menu:WelcomeMenu' => 'Willkommen',
-	'Menu:WelcomeMenu+' => 'Willkommen bei iTop',
-	'Menu:WelcomeMenuPage' => 'Willkommen',
-	'Menu:WelcomeMenuPage+' => 'Willkommen bei iTop',
+	'Menu:WelcomeMenu' => 'Willkommen', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenu+' => 'Willkommen bei iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage' => 'Willkommen', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage+' => 'Willkommen bei iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Willkommen bei iTop',
 	'UI:WelcomeMenu:LeftBlock' => '<p>iTop ist ein ein vollständiges, ITIL- und webbasiertes IT-Service-Management-Tool (ITSM)</p>
 <ul>Es umfasst...
@@ -667,9 +667,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'UI:UserManagement:GrantMatrix' => 'Zugriffsmatrix',
 	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Verbindung zwischen %1$s und %2$s',
 	'UI:UserManagement:LinkBetween_User_And_Org' => 'Verbindung zwischen %1$s und %2$s',
-	'Menu:AdminTools' => 'Admin-Tools',
-	'Menu:AdminTools+' => 'Administrationswerkzeuge',
-	'Menu:AdminTools?' => 'Werkzeuge, die nur für Benutzer mit Adminstratorprofil zugänglich sind',
+	'Menu:AdminTools' => 'Admin-Tools', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools+' => 'Administrationswerkzeuge', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools?' => 'Werkzeuge, die nur für Benutzer mit Adminstratorprofil zugänglich sind', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:ChangeManagementMenu' => 'Change Management',
 	'UI:ChangeManagementMenu+' => 'Change Management',
 	'UI:ChangeManagementMenu:Title' => 'Übersicht an Changes',
@@ -706,14 +706,14 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'UI-ContactsMenu-ContactsByLocation' => 'Kontakte nach Standort',
 	'UI-ContactsMenu-ContactsByType' => 'Kontakte nach Typ',
 	'UI-ContactsMenu-ContactsByStatus' => 'Kontakte nach Status',
-	'Menu:CSVImportMenu' => 'CSV-Import',
-	'Menu:CSVImportMenu+' => 'Massenerstellung oder -aktualisierung',
-	'Menu:DataModelMenu' => 'Datenmodell',
-	'Menu:DataModelMenu+' => 'Übersicht des Datenmodells',
-	'Menu:ExportMenu' => 'Export',
-	'Menu:ExportMenu+' => 'Export einer beliebigen Abfrage in HTML, CSV oder XML',
-	'Menu:NotificationsMenu' => 'Benachrichtigungen',
-	'Menu:NotificationsMenu+' => 'Einstellungen der Benachrichtigungen',
+	'Menu:CSVImportMenu' => 'CSV-Import', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:CSVImportMenu+' => 'Massenerstellung oder -aktualisierung', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu' => 'Datenmodell', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu+' => 'Übersicht des Datenmodells', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu' => 'Export', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu+' => 'Export einer beliebigen Abfrage in HTML, CSV oder XML', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu' => 'Benachrichtigungen', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu+' => 'Einstellungen der Benachrichtigungen', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Einstellungen der <span class="hilite">Benachrichtigungen</span>',
 	'UI:NotificationsMenu:Help' => 'Hilfe',
 	'UI:NotificationsMenu:HelpContent' => '<p>In iTop sind Benachrichtigungen vollständig anpassbar. Sie basieren auf zwei Gruppen an Objekten: <i>Trigger und Aktionen</i>.</p>
@@ -737,28 +737,25 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'UI:NotificationsMenu:OnStateLeave' => 'Wenn ein Objekt einen gegebenen Status verlässt',
 	'UI:NotificationsMenu:Actions' => 'Aktionen',
 	'UI:NotificationsMenu:AvailableActions' => 'Verfügbare Aktionen',
-	'Menu:AuditCategories' => 'Audit-Kategorien',
-	'Menu:AuditCategories+' => 'Audit-Kategorien',
-	'Menu:Notifications:Title' => 'Audit-Kategorien',
-	'Menu:RunQueriesMenu' => 'Abfrage ausführen',
-	'Menu:RunQueriesMenu+' => 'Eine beliebige Abfrage ausführen',
-	'Menu:QueryMenu' => 'Query-Bibliothek',
-	'Menu:QueryMenu+' => '',
-	'Menu:DataAdministration' => 'Data Management',
-	'Menu:DataAdministration+' => 'Data Management',
-	'Menu:UniversalSearchMenu' => 'Universelle Suche',
-	'Menu:UniversalSearchMenu+' => 'Suchen Sie nach beliebigen Inhalt...',
-	'Menu:ApplicationLogMenu' => 'Protokoll der Anwendung',
-	'Menu:ApplicationLogMenu+' => 'Protokoll der Anwendung',
-	'Menu:ApplicationLogMenu:Title' => 'Protokoll der Anwendung',
-	'Menu:UserManagementMenu' => 'User-Management',
-	'Menu:UserManagementMenu+' => 'User-Management',
-	'Menu:ProfilesMenu' => 'Profile',
-	'Menu:ProfilesMenu+' => 'Profile',
-	'Menu:ProfilesMenu:Title' => 'Profile',
-	'Menu:UserAccountsMenu' => 'Benutzerkonten',
-	'Menu:UserAccountsMenu+' => 'Benutzerkonten',
-	'Menu:UserAccountsMenu:Title' => 'Benutzerkonten',
+	'Menu:AuditCategories' => 'Audit-Kategorien', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AuditCategories+' => 'Audit-Kategorien', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:Notifications:Title' => 'Audit-Kategorien', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu' => 'Abfrage ausführen', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu+' => 'Eine beliebige Abfrage ausführen', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:QueryMenu' => 'Query-Bibliothek', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:QueryMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration' => 'Data Management', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration+' => 'Data Management', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu' => 'Universelle Suche', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu+' => 'Suchen Sie nach beliebigen Inhalt...', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu' => 'User-Management', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu+' => 'User-Management', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu' => 'Profile', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu+' => 'Profile', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu:Title' => 'Profile', // 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+' => '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:PropertiesTab' => 'Eigenschaften',

+ 2 - 2
dictionaries/dictionary.itop.core.php

@@ -628,8 +628,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Core:Synchro:NeverRun' => 'This synchro was never run. No log yet.',
 	'Core:Synchro:SynchroEndedOn_Date' => 'The latest synchronization ended on %1$s.',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'The synchronization started on %1$s is still running...',
-	'Menu:DataSources' => 'Synchronization Data Sources',
-	'Menu:DataSources+' => 'All Synchronization Data Sources',
+	'Menu:DataSources' => 'Synchronization Data Sources', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => 'All Synchronization Data Sources', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Ignored (%1$s)',
 	'Core:Synchro:label_repl_disappeared' => 'Disappeared (%1$s)',
 	'Core:Synchro:label_repl_existing' => 'Existing (%1$s)',

+ 35 - 39
dictionaries/dictionary.itop.ui.php

@@ -314,10 +314,10 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'BooleanLabel:yes' => 'yes',
 	'BooleanLabel:no' => 'no',
-	'Menu:WelcomeMenu' => 'Welcome',
-	'Menu:WelcomeMenu+' => 'Welcome to iTop',
-	'Menu:WelcomeMenuPage' => 'Welcome',
-	'Menu:WelcomeMenuPage+' => 'Welcome to iTop',
+	'Menu:WelcomeMenu' => 'Welcome', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenu+' => 'Welcome to iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage' => 'Welcome', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage+' => 'Welcome to iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Welcome to iTop',
 
 	'UI:WelcomeMenu:LeftBlock' => '<p>iTop is a complete, OpenSource, IT Operational Portal.</p>
@@ -832,9 +832,9 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Link between %1$s and %2$s',
 	'UI:UserManagement:LinkBetween_User_And_Org' => 'Link between %1$s and %2$s',
 	
-	'Menu:AdminTools' => 'Admin tools',
-	'Menu:AdminTools+' => 'Administration tools',
-	'Menu:AdminTools?' => 'Tools accessible only to users having the administrator profile',
+	'Menu:AdminTools' => 'Admin tools', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools+' => 'Administration tools', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools?' => 'Tools accessible only to users having the administrator profile', // Duplicated into itop-welcome-itil (will be removed from here...)
 
 	'UI:ChangeManagementMenu' => 'Change Management',
 	'UI:ChangeManagementMenu+' => 'Change Management',
@@ -880,17 +880,17 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI-ContactsMenu-ContactsByType' => 'Contacts by type',
 	'UI-ContactsMenu-ContactsByStatus' => 'Contacts by status',
 
-	'Menu:CSVImportMenu' => 'CSV import',
-	'Menu:CSVImportMenu+' => 'Bulk creation or update',
+	'Menu:CSVImportMenu' => 'CSV import', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:CSVImportMenu+' => 'Bulk creation or update', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:DataModelMenu' => 'Data Model',
-	'Menu:DataModelMenu+' => 'Overview of the Data Model',
+	'Menu:DataModelMenu' => 'Data Model', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu+' => 'Overview of the Data Model', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:ExportMenu' => 'Export',
-	'Menu:ExportMenu+' => 'Export the results of any query in HTML, CSV or XML',
+	'Menu:ExportMenu' => 'Export', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu+' => 'Export the results of any query in HTML, CSV or XML', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:NotificationsMenu' => 'Notifications',
-	'Menu:NotificationsMenu+' => 'Configuration of the Notifications',
+	'Menu:NotificationsMenu' => 'Notifications', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu+' => 'Configuration of the Notifications', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Configuration of the <span class="hilite">Notifications</span>',
 	'UI:NotificationsMenu:Help' => 'Help',
 	'UI:NotificationsMenu:HelpContent' => '<p>In iTop the notifications are fully customizable. They are based on two sets of objects: <i>triggers and actions</i>.</p>
@@ -918,36 +918,32 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:NotificationsMenu:Actions' => 'Actions',
 	'UI:NotificationsMenu:AvailableActions' => 'Available actions',
 	
-	'Menu:AuditCategories' => 'Audit Categories',
-	'Menu:AuditCategories+' => 'Audit Categories',
-	'Menu:Notifications:Title' => 'Audit Categories',
+	'Menu:AuditCategories' => 'Audit Categories', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AuditCategories+' => 'Audit Categories', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:Notifications:Title' => 'Audit Categories', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:RunQueriesMenu' => 'Run Queries',
-	'Menu:RunQueriesMenu+' => 'Run any query',
+	'Menu:RunQueriesMenu' => 'Run Queries', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu+' => 'Run any query', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:QueryMenu' => 'Query phrasebook',
-	'Menu:QueryMenu+' => 'Query phrasebook',
+	'Menu:QueryMenu' => 'Query phrasebook', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:QueryMenu+' => 'Query phrasebook', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:DataAdministration' => 'Data administration',
-	'Menu:DataAdministration+' => 'Data administration',
+	'Menu:DataAdministration' => 'Data administration', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration+' => 'Data administration', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:UniversalSearchMenu' => 'Universal Search',
-	'Menu:UniversalSearchMenu+' => 'Search for anything...',
+	'Menu:UniversalSearchMenu' => 'Universal Search', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu+' => 'Search for anything...', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:ApplicationLogMenu' => 'Log de l\'application',
-	'Menu:ApplicationLogMenu+' => 'Log de l\'application',
-	'Menu:ApplicationLogMenu:Title' => 'Log de l\'application',
+	'Menu:UserManagementMenu' => 'User Management', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu+' => 'User management', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:UserManagementMenu' => 'User Management',
-	'Menu:UserManagementMenu+' => 'User management',
+	'Menu:ProfilesMenu' => 'Profiles', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu+' => 'Profiles', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu:Title' => 'Profiles', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:ProfilesMenu' => 'Profiles',
-	'Menu:ProfilesMenu+' => 'Profiles',
-	'Menu:ProfilesMenu:Title' => 'Profiles',
-
-	'Menu:UserAccountsMenu' => 'User Accounts',
-	'Menu:UserAccountsMenu+' => 'User Accounts',
-	'Menu:UserAccountsMenu:Title' => 'User Accounts',	
+	'Menu:UserAccountsMenu' => 'User Accounts', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'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',
@@ -1180,7 +1176,7 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'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',
+	'Menu:MyShortcuts' => 'My Shortcuts', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => 'Shortcut',
 	'Class:Shortcut+' => '',
 	'Class:Shortcut/Attribute:name' => 'Name',

+ 2 - 2
dictionaries/es_cr.dictionary.itop.core.php

@@ -622,8 +622,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Core:Synchro:NeverRun' => 'Esta Sincronización no ha sido ejecutada. No hay bitácora todavía.',
 	'Core:Synchro:SynchroEndedOn_Date' => 'La última Sincronización terminó en %1$s.',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'La Sincronización iniciada en %1$s está todavía en ejecución.',
-	'Menu:DataSources' => 'Fuentes de Datos Sincronizables',
-	'Menu:DataSources+' => 'Fuentes de Datos Sincronizables',
+	'Menu:DataSources' => 'Fuentes de Datos Sincronizables', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => 'Fuentes de Datos Sincronizables', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Ignorados (%1$s)',
 	'Core:Synchro:label_repl_disappeared' => 'Desaparecieron (%1$s)',
 	'Core:Synchro:label_repl_existing' => 'Existen (%1$s)',

+ 35 - 39
dictionaries/es_cr.dictionary.itop.ui.php

@@ -311,10 +311,10 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'BooleanLabel:yes' => 'si',
 	'BooleanLabel:no' => 'no',
-	'Menu:WelcomeMenu' => 'Bienvenido',
-	'Menu:WelcomeMenu+' => 'Bienvenido a iTop',
-	'Menu:WelcomeMenuPage' => 'Bienvenido',
-	'Menu:WelcomeMenuPage+' => 'Bienvenido a iTop',
+	'Menu:WelcomeMenu' => 'Bienvenido', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenu+' => 'Bienvenido a iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage' => 'Bienvenido', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage+' => 'Bienvenido a iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Bienvenido a iTop',
 
 	'UI:WelcomeMenu:LeftBlock' => '<p>iTop es un completo portal de administración de servicios de TI basado en código abierto.</p>
@@ -824,9 +824,9 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Vinculo entre %1$s y %2$s',
 	'UI:UserManagement:LinkBetween_User_And_Org' => 'Vínculo entre %1$s y %2$s',
 	
-	'Menu:AdminTools' => 'Herramientas Administrativas',
-	'Menu:AdminTools+' => 'Herramientas Administrativas',
-	'Menu:AdminTools?' => 'Herramientas accesibles sólo a usuarios con Perfil de administrador',
+	'Menu:AdminTools' => 'Herramientas Administrativas', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools+' => 'Herramientas Administrativas', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools?' => 'Herramientas accesibles sólo a usuarios con Perfil de administrador', // Duplicated into itop-welcome-itil (will be removed from here...)
 
 	'UI:ChangeManagementMenu' => 'Control de Cambios',
 	'UI:ChangeManagementMenu+' => 'Control de Cambios',
@@ -872,17 +872,17 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'UI-ContactsMenu-ContactsByType' => 'Contactos por Tipo',
 	'UI-ContactsMenu-ContactsByStatus' => 'Contactos por Estatus',
 
-	'Menu:CSVImportMenu' => 'Importar CSV',
-	'Menu:CSVImportMenu+' => 'Creación o Actualización Másiva',
+	'Menu:CSVImportMenu' => 'Importar CSV', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:CSVImportMenu+' => 'Creación o Actualización Másiva', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:DataModelMenu' => 'Modelo de Datos',
-	'Menu:DataModelMenu+' => 'Resumen del Modelo de Datos',
+	'Menu:DataModelMenu' => 'Modelo de Datos', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu+' => 'Resumen del Modelo de Datos', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:ExportMenu' => 'Exportar',
-	'Menu:ExportMenu+' => 'Exportar los Resultados de Cualquier Consulta en HTML, CSV o XML',
+	'Menu:ExportMenu' => 'Exportar', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu+' => 'Exportar los Resultados de Cualquier Consulta en HTML, CSV o XML', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:NotificationsMenu' => 'Notificaciones',
-	'Menu:NotificationsMenu+' => 'Configuración de las Notificaciones',
+	'Menu:NotificationsMenu' => 'Notificaciones', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu+' => 'Configuración de las Notificaciones', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Configuración de las <span class="hilite">Notificaciones</span>',
 	'UI:NotificationsMenu:Help' => 'Ayuda',
 	'UI:NotificationsMenu:HelpContent' => '<p>En iTop las notificaciones son completamente personalizables. Están basadas en dos conjuntos de objetos: <i>Disparadores y Acciones</i>.</p>
@@ -910,36 +910,32 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'UI:NotificationsMenu:Actions' => 'Acciones',
 	'UI:NotificationsMenu:AvailableActions' => 'Acciones Disponibles',
 
-	'Menu:AuditCategories' => 'Auditar Categorías',
-	'Menu:AuditCategories+' => 'Auditar Categorías',
-	'Menu:Notifications:Title' => 'Auditar Categorías',
+	'Menu:AuditCategories' => 'Auditar Categorías', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AuditCategories+' => 'Auditar Categorías', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:Notifications:Title' => 'Auditar Categorías', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:RunQueriesMenu' => 'Ejecutar Consultas',
-	'Menu:RunQueriesMenu+' => 'Ejecutar Cualquier Consulta',
+	'Menu:RunQueriesMenu' => 'Ejecutar Consultas', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu+' => 'Ejecutar Cualquier Consulta', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:QueryMenu' => 'Libreta de Consultas',
-	'Menu:QueryMenu+' => 'Libreta de Consultas',
+	'Menu:QueryMenu' => 'Libreta de Consultas', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:QueryMenu+' => 'Libreta de Consultas', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:DataAdministration' => 'Administración de Datos',
-	'Menu:DataAdministration+' => 'Administración de Datos',
+	'Menu:DataAdministration' => 'Administración de Datos', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration+' => 'Administración de Datos', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:UniversalSearchMenu' => 'Búsqueda Universal',
-	'Menu:UniversalSearchMenu+' => 'Buscar cualquier cosa',
+	'Menu:UniversalSearchMenu' => 'Búsqueda Universal', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu+' => 'Buscar cualquier cosa', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:ApplicationLogMenu' => 'Bitácoras de la Aplicación',
-	'Menu:ApplicationLogMenu+' => 'Bitácoras de la Aplicación',
-	'Menu:ApplicationLogMenu:Title' => 'Bitácoras de la Aplicación',
+	'Menu:UserManagementMenu' => 'Administración de Usuarios', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu+' => 'Administración de Usuarios', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:UserManagementMenu' => 'Administración de Usuarios',
-	'Menu:UserManagementMenu+' => 'Administración de Usuarios',
+	'Menu:ProfilesMenu' => 'Perfiles', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu+' => 'Perfiles', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu:Title' => 'Perfiles', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:ProfilesMenu' => 'Perfiles',
-	'Menu:ProfilesMenu+' => 'Perfiles',
-	'Menu:ProfilesMenu:Title' => 'Perfiles',
-
-	'Menu:UserAccountsMenu' => 'Cuentas de Usuario',
-	'Menu:UserAccountsMenu+' => 'Cuentas de Usuario',
-	'Menu:UserAccountsMenu:Title' => 'Cuentas de Usuario',	
+	'Menu:UserAccountsMenu' => 'Cuentas de Usuario', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'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',
@@ -1171,7 +1167,7 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'UI:ShortcutRenameDlg:Title' => 'Renombrar Acceso Rápido',
 	'UI:ShortcutListDlg:Title' => 'Crear Acceso Rápido para la Lista',
 	'UI:ShortcutDelete:Confirm' => 'Por favor conforme que desea Eliminar el/los Acceso(s) Rápido(s)',
-	'Menu:MyShortcuts' => 'Mis Accesos Rápidos',
+	'Menu:MyShortcuts' => 'Mis Accesos Rápidos', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => 'Acceso Rápido',
 	'Class:Shortcut+' => 'Acceso Rápido',
 	'Class:Shortcut/Attribute:name' => 'Nombre',

+ 2 - 2
dictionaries/fr.dictionary.itop.core.php

@@ -589,8 +589,8 @@ Opérateurs :<br/>
 	'Core:Synchro:NeverRun' => 'Aucun historique, la synchronisation n\'a pas encore fonctionné',
 	'Core:Synchro:SynchroEndedOn_Date' => 'La dernière synchronisation s\'est terminée à: %1$s.',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Synchronisation en cours (début à %1$s)',
-	'Menu:DataSources' => 'Synchronisation',
-	'Menu:DataSources+' => '',
+	'Menu:DataSources' => 'Synchronisation', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Ignorés (%1$s)',
 	'Core:Synchro:label_repl_disappeared' => 'Disparus (%1$s)',
 	'Core:Synchro:label_repl_existing' => 'Existants (%1$s)',

+ 35 - 38
dictionaries/fr.dictionary.itop.ui.php

@@ -196,10 +196,10 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:URP_ClassProjection/Attribute:attribute+' => 'Target attribute code (optional)',
 	'BooleanLabel:yes' => 'oui',
 	'BooleanLabel:no' => 'non',
-	'Menu:WelcomeMenu' => 'Bienvenue',
-	'Menu:WelcomeMenu+' => 'Bienvenue dans iTop',
-	'Menu:WelcomeMenuPage' => 'Bienvenue',
-	'Menu:WelcomeMenuPage+' => 'Bienvenue dans iTop',
+	'Menu:WelcomeMenu' => 'Bienvenue', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenu+' => 'Bienvenue dans iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage' => 'Bienvenue', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage+' => 'Bienvenue dans iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Bienvenue dans iTop',
 	'UI:WelcomeMenu:LeftBlock' => '<p>iTop est un portail opérationnel complet et libre pour gérer votre SI.</p>
 <ul>il contient:
@@ -700,9 +700,9 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:UserManagement:GrantMatrix' => 'Matrice des droits',
 	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Lien entre %1$s et %2$s',
 	'UI:UserManagement:LinkBetween_User_And_Org' => 'Lien entre %1$s et %2$s',
-	'Menu:AdminTools' => 'Outils d\'admin',
-	'Menu:AdminTools+' => 'Outils d\'administration',
-	'Menu:AdminTools?' => 'Ces outils sont accessibles uniquement aux utilisateurs possédant le profil Administrateur.',
+	'Menu:AdminTools' => 'Outils d\'admin', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools+' => 'Outils d\'administration', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools?' => 'Ces outils sont accessibles uniquement aux utilisateurs possédant le profil Administrateur.', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:ChangeManagementMenu' => 'Gestion du Changement',
 	'UI:ChangeManagementMenu+' => 'Gestion du Changement',
 	'UI:ChangeManagementMenu:Title' => 'Résumé des changements',
@@ -739,14 +739,14 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI-ContactsMenu-ContactsByLocation' => 'Contacts par emplacement',
 	'UI-ContactsMenu-ContactsByType' => 'Contacts par type',
 	'UI-ContactsMenu-ContactsByStatus' => 'Contacts par état',
-	'Menu:CSVImportMenu' => 'Import CSV',
-	'Menu:CSVImportMenu+' => 'Import ou mise à jour en masse',
-	'Menu:DataModelMenu' => 'Modèle de Données',
-	'Menu:DataModelMenu+' => 'Résumé du Modèle de Données',
-	'Menu:ExportMenu' => 'Exportation',
-	'Menu:ExportMenu+' => 'Exportation des résultats d\'une requête en HTML, CSV ou XML',
-	'Menu:NotificationsMenu' => 'Notifications',
-	'Menu:NotificationsMenu+' => 'Configuration des Notifications',
+	'Menu:CSVImportMenu' => 'Import CSV', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:CSVImportMenu+' => 'Import ou mise à jour en masse', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu' => 'Modèle de Données', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu+' => 'Résumé du Modèle de Données', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu' => 'Exportation', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu+' => 'Exportation des résultats d\'une requête en HTML, CSV ou XML', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu' => 'Notifications', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu+' => 'Configuration des Notifications', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Configuration des <span class="hilite">Notifications</span>',
 	'UI:NotificationsMenu:Help' => 'Aide',
 	'UI:NotificationsMenu:HelpContent' => '<p>Dans iTop les notifications sont totalement configurables. Elles sont basées sur deux types d\'objets: <i>déclencheurs et actions</i>.</p>
@@ -772,28 +772,25 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:NotificationsMenu:OnStateLeave' => 'Quand un objet quitte un état donné',
 	'UI:NotificationsMenu:Actions' => 'Actions',
 	'UI:NotificationsMenu:AvailableActions' => 'Actions existantes',
-	'Menu:AuditCategories' => 'Catégories d\'audit',
-	'Menu:AuditCategories+' => 'Catégories d\'audit',
-	'Menu:Notifications:Title' => 'Catégories d\'audit',
-	'Menu:RunQueriesMenu' => 'Requêtes OQL',
-	'Menu:RunQueriesMenu+' => 'Executer une requête OQL',
-	'Menu:QueryMenu' => 'Livre des requêtes',
-	'Menu:QueryMenu+' => 'Livre des requêtes',
-	'Menu:DataAdministration' => 'Administration des données',
-	'Menu:DataAdministration+' => 'Administration des données',
-	'Menu:UniversalSearchMenu' => 'Recherche Universelle',
-	'Menu:UniversalSearchMenu+' => 'Rechercher n\'importe quel objet...',
-	'Menu:ApplicationLogMenu' => 'Application Log',
-	'Menu:ApplicationLogMenu+' => 'Application Log',
-	'Menu:ApplicationLogMenu:Title' => 'Application Log',
-	'Menu:UserManagementMenu' => 'Gestion des Utilisateurs',
-	'Menu:UserManagementMenu+' => 'Gestion des Utilisateurs',
-	'Menu:ProfilesMenu' => 'Profils',
-	'Menu:ProfilesMenu+' => 'Profils',
-	'Menu:ProfilesMenu:Title' => 'Profils',
-	'Menu:UserAccountsMenu' => 'Comptes Utilisateurs',
-	'Menu:UserAccountsMenu+' => 'Comptes Utilisateurs',
-	'Menu:UserAccountsMenu:Title' => 'Comptes Utilisateusr',
+	'Menu:AuditCategories' => 'Catégories d\'audit', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AuditCategories+' => 'Catégories d\'audit', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:Notifications:Title' => 'Catégories d\'audit', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu' => 'Requêtes OQL', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu+' => 'Executer une requête OQL', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:QueryMenu' => 'Livre des requêtes', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:QueryMenu+' => 'Livre des requêtes', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration' => 'Administration des données', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration+' => 'Administration des données', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu' => 'Recherche Universelle', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu+' => 'Rechercher n\'importe quel objet...', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu' => 'Gestion des Utilisateurs', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu+' => 'Gestion des Utilisateurs', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu' => 'Profils', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu+' => 'Profils', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu:Title' => 'Profils', // 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+' => '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:PropertiesTab' => 'Propriétés',
@@ -1020,7 +1017,7 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:ShortcutListDlg:Title' => 'Créer un raccourci pour la liste',
 	'UI:ShortcutRenameDlg:Title' => 'Renommer le raccourci',
 	'UI:ShortcutDelete:Confirm' => 'Veuillez confirmer la suppression du ou des raccourci(s)',
-	'Menu:MyShortcuts' => 'Mes raccourcis',
+	'Menu:MyShortcuts' => 'Mes raccourcis', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => 'Raccourci',
 	'Class:Shortcut+' => '',
 	'Class:Shortcut/Attribute:name' => 'Nom',

+ 2 - 2
dictionaries/hu.dictionary.itop.core.php

@@ -426,8 +426,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Core:Synchro:NeverRun' => 'Ez a szinkronizáció még soha nem futott. Nincs még napló bejegyzés.',
 	'Core:Synchro:SynchroEndedOn_Date' => 'Az utolsó szinkronizáció lefutásának időpontja: %1$s.',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Az szinkronizáció elindut %1$s, de még fut.',
-	'Menu:DataSources' => 'Szinkronizált adatforrások',
-	'Menu:DataSources+' => '',
+	'Menu:DataSources' => 'Szinkronizált adatforrások', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Figyelmen kívül hagyott (%1$s)',
 	'Core:Synchro:label_repl_disappeared' => 'Elveszett (%1$s)',
 	'Core:Synchro:label_repl_existing' => 'Létező (%1$s)',

+ 32 - 35
dictionaries/hu.dictionary.itop.ui.php

@@ -184,10 +184,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:URP_StimulusGrant/Attribute:profile+' => '',
 	'BooleanLabel:yes' => 'Igen',
 	'BooleanLabel:no' => 'Nem',
-	'Menu:WelcomeMenu' => 'Üdvözlöm',
-	'Menu:WelcomeMenu+' => '',
-	'Menu:WelcomeMenuPage' => 'Üdvözlöm',
-	'Menu:WelcomeMenuPage+' => '',
+	'Menu:WelcomeMenu' => 'Üdvözlöm', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage' => 'Üdvözlöm', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Üdvözli az iTop',
 	'UI:WelcomeMenu:LeftBlock' => '<p>iTop egy teljeskörű, OpenSource, IT üzemeltetés támogató portál.</p>
 <ul>A következőket tartalmazza:
@@ -602,9 +602,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI:UserManagement:GrantMatrix' => 'Jogosutlsági mátrix',
 	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Kapcsolat %1$s és %2$s között',
 	'UI:UserManagement:LinkBetween_User_And_Org' => 'Kapcsolat %1$s és %2$s között',
-	'Menu:AdminTools' => 'Adminisztrációs eszközök',
-	'Menu:AdminTools+' => '',
-	'Menu:AdminTools?' => 'Eszközök csak az adminisztrátori profilhoz rendlet felhasználók számára elérhetők.',
+	'Menu:AdminTools' => 'Adminisztrációs eszközök', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools?' => 'Eszközök csak az adminisztrátori profilhoz rendlet felhasználók számára elérhetők.', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:ChangeManagementMenu' => 'Változás menedzsment',
 	'UI:ChangeManagementMenu+' => '',
 	'UI:ChangeManagementMenu:Title' => 'Változás áttekintése',
@@ -641,14 +641,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI-ContactsMenu-ContactsByLocation' => 'Kapcsolattartók földrajzi hely szerint',
 	'UI-ContactsMenu-ContactsByType' => 'Kapcsolattartók típus szerint',
 	'UI-ContactsMenu-ContactsByStatus' => 'Kapcsolattartók státusz szerint',
-	'Menu:CSVImportMenu' => 'CSV import',
-	'Menu:CSVImportMenu+' => '',
-	'Menu:DataModelMenu' => 'Adatmodell',
-	'Menu:DataModelMenu+' => '',
-	'Menu:ExportMenu' => 'Export',
-	'Menu:ExportMenu+' => '',
-	'Menu:NotificationsMenu' => 'Értesítések',
-	'Menu:NotificationsMenu+' => '',
+	'Menu:CSVImportMenu' => 'CSV import', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:CSVImportMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu' => 'Adatmodell', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu' => 'Export', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu' => 'Értesítések', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => '<span class="hilite">Értesítések</span> beállítása',
 	'UI:NotificationsMenu:Help' => 'Segítség',
 	'UI:NotificationsMenu:HelpContent' => '<p>Az iTop alkalmazásban az értesítések teljesen testreszabhatók. Értesítések az objektumok két csoportjára épülnek: <i>kiváltó okok és akciók</i>.</p>
@@ -672,26 +672,23 @@ Akció kiváltó okhoz rendelésekor kap egy sorszámot , amely meghatározza az
 	'UI:NotificationsMenu:OnStateLeave' => 'Objektum állotból való kilépése',
 	'UI:NotificationsMenu:Actions' => 'Akciók',
 	'UI:NotificationsMenu:AvailableActions' => 'Lehetséges akciók',
-	'Menu:AuditCategories' => 'Audit kategóriák',
-	'Menu:AuditCategories+' => '',
-	'Menu:Notifications:Title' => 'Audit kategóriák',
-	'Menu:RunQueriesMenu' => 'Lekérdezés futtatás',
-	'Menu:RunQueriesMenu+' => '',
-	'Menu:DataAdministration' => 'Adat adminisztráció',
-	'Menu:DataAdministration+' => '',
-	'Menu:UniversalSearchMenu' => 'Univerzális keresés',
-	'Menu:UniversalSearchMenu+' => '',
-	'Menu:ApplicationLogMenu' => 'Alkalmazás napló',
-	'Menu:ApplicationLogMenu+' => '',
-	'Menu:ApplicationLogMenu:Title' => 'Alkalmazás napló',
-	'Menu:UserManagementMenu' => 'Felhasználó menedzsment',
-	'Menu:UserManagementMenu+' => '',
-	'Menu:ProfilesMenu' => 'Profilok',
-	'Menu:ProfilesMenu+' => '',
-	'Menu:ProfilesMenu:Title' => 'Profilok',
-	'Menu:UserAccountsMenu' => 'Felhasználói fiókok',
-	'Menu:UserAccountsMenu+' => '',
-	'Menu:UserAccountsMenu:Title' => 'Felhasználói fiókok',
+	'Menu:AuditCategories' => 'Audit kategóriák', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AuditCategories+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:Notifications:Title' => 'Audit kategóriák', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu' => 'Lekérdezés futtatás', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration' => 'Adat adminisztráció', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu' => 'Univerzális keresés', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu' => 'Felhasználó menedzsment', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu' => 'Profilok', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu:Title' => 'Profilok', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'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:PropertiesTab' => 'Tulajdonságok',

+ 2 - 2
dictionaries/it.dictionary.itop.core.php

@@ -595,8 +595,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Core:Synchro:NeverRun' => 'Questa sincronizzazione non è mai stata eseguita. Nessun Log ancora...',
 	'Core:Synchro:SynchroEndedOn_Date' => 'L\'ultima sincronizzazione si è conclusa il %1$s.~~',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'La sincronizzazione è iniziata il %1$s è ancora in esecuzione...~~',
-	'Menu:DataSources' => 'Sorgente di sincronizzazione dei dati',
-	'Menu:DataSources+' => '',
+	'Menu:DataSources' => 'Sorgente di sincronizzazione dei dati', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Ignorato(%1$s)',
 	'Core:Synchro:label_repl_disappeared' => 'Scomparso (%1$s)',
 	'Core:Synchro:label_repl_existing' => 'Esistente (%1$s)',

+ 32 - 35
dictionaries/it.dictionary.itop.ui.php

@@ -313,10 +313,10 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'BooleanLabel:yes' => 'si',
 	'BooleanLabel:no' => 'no',
-	'Menu:WelcomeMenu' => 'Benveuto',
-	'Menu:WelcomeMenu+' => '',
-	'Menu:WelcomeMenuPage' => 'Benvenuto',
-	'Menu:WelcomeMenuPage+' => '',
+	'Menu:WelcomeMenu' => 'Benveuto', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage' => 'Benvenuto', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Benveuto su iTop',
 	'UI:WelcomeMenu:LeftBlock' => '<p>iTop è un completo Portale Funzionale IT, Open Source.</p>
 <ul>Esso include:
@@ -734,9 +734,9 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'UI:UserManagement:GrantMatrix' => 'Grant Matrix',
 	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Collegamento tra %1$s e %2$s',
 	'UI:UserManagement:LinkBetween_User_And_Org' => 'Collegamento tra %1$s e %2$s',
-	'Menu:AdminTools' => 'Strumenti di amministrazione',
-	'Menu:AdminTools+' => '',
-	'Menu:AdminTools?' => 'Strumenti accessibile solo agli utenti con il profilo di amministratore',
+	'Menu:AdminTools' => 'Strumenti di amministrazione', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools?' => 'Strumenti accessibile solo agli utenti con il profilo di amministratore', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:ChangeManagementMenu' => 'Gestione Cambi',
 	'UI:ChangeManagementMenu+' => '',
 	'UI:ChangeManagementMenu:Title' => 'Panoramica dei cambi',
@@ -773,14 +773,14 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'UI-ContactsMenu-ContactsByLocation' => 'Contatti per localizzazione',
 	'UI-ContactsMenu-ContactsByType' => 'Contatti per tipo',
 	'UI-ContactsMenu-ContactsByStatus' => 'Contatti per stato',
-	'Menu:CSVImportMenu' =>  'Importazione CSV',
-	'Menu:CSVImportMenu+' => '',
-	'Menu:DataModelMenu' => 'Modello Dati',
-	'Menu:DataModelMenu+' => '',
-	'Menu:ExportMenu' => 'Esporta',
-	'Menu:ExportMenu+' => '',
-	'Menu:NotificationsMenu' =>  'Notifiche',
-	'Menu:NotificationsMenu+' => '',
+	'Menu:CSVImportMenu' =>  'Importazione CSV', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:CSVImportMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu' => 'Modello Dati', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu' => 'Esporta', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu' =>  'Notifiche', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' =>  'Configurazione delle <span class="hilite">Notifiche</span>',
 	'UI:NotificationsMenu:Help' => 'Aiuto',
 	'UI:NotificationsMenu:HelpContent' => '<p>In iTop le notifiche sono completamente personalizzabili. Essi si basano su due serie di oggetti: <i>trigger e azioni</i>.</p>
@@ -806,26 +806,23 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'UI:NotificationsMenu:OnStateLeave' => 'Quando un oggetto lascia un determinato stato',
 	'UI:NotificationsMenu:Actions' => 'Azioni',
 	'UI:NotificationsMenu:AvailableActions' => 'Azioni disponibili',
-	'Menu:AuditCategories' => 'Categorie di Audit',
-	'Menu:AuditCategories+' => '',
-	'Menu:Notifications:Title' => 'Categorie di Audit',
-	'Menu:RunQueriesMenu' => 'Esegui query',
-	'Menu:RunQueriesMenu+' => '',
-	'Menu:DataAdministration' => 'Dati di amministrazione',
-	'Menu:DataAdministration+' => '',
-	'Menu:UniversalSearchMenu' => 'Ricerca universale',
-	'Menu:UniversalSearchMenu+' => '',
-	'Menu:ApplicationLogMenu' => 'Log dell\'applicazione',
-	'Menu:ApplicationLogMenu+' => '',
-	'Menu:ApplicationLogMenu:Title' => 'Log dell\'applicazione',
-	'Menu:UserManagementMenu' => 'Gestione degli utenti',
-	'Menu:UserManagementMenu+' => '',
-	'Menu:ProfilesMenu' => 'Profili',
-	'Menu:ProfilesMenu+' => '',
-	'Menu:ProfilesMenu:Title' => 'Profili',
-	'Menu:UserAccountsMenu' => 'Account utente',
-	'Menu:UserAccountsMenu+' => '',
-	'Menu:UserAccountsMenu:Title' => 'Account utente',
+	'Menu:AuditCategories' => 'Categorie di Audit', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AuditCategories+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:Notifications:Title' => 'Categorie di Audit', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu' => 'Esegui query', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration' => 'Dati di amministrazione', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu' => 'Ricerca universale', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu' => 'Gestione degli utenti', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu' => 'Profili', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu:Title' => 'Profili', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'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:PropertiesTab' => 'Proprietà',

+ 2 - 4
dictionaries/ja.dictionary.itop.core.php

@@ -481,8 +481,8 @@ Operators:<br/>
 	'Core:Synchro:NeverRun' => 'この同期は実行されたことがありません。ログはありません。',
 	'Core:Synchro:SynchroEndedOn_Date' => '最後の同期は %1$s に終了しました。',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => '同期は %1$s に始まり、現在実行中です。',
-	'Menu:DataSources' => '同期データソース',
-	'Menu:DataSources+' => '全ての同期データソース',
+	'Menu:DataSources' => '同期データソース', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => '全ての同期データソース', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => '無視 (%1$s)',
 	'Core:Synchro:label_repl_disappeared' => '消えた (%1$s)',
 	'Core:Synchro:label_repl_existing' => '存在 (%1$s)',
@@ -553,8 +553,6 @@ Operators:<br/>
 	'Class:Licence/Attribute:perpetual/Value:no+' => '',
 	'Class:Licence/Attribute:perpetual/Value:yes' => 'はい',
 	'Class:Licence/Attribute:perpetual/Value:yes+' => '',
-	'Menu:OSVersion' => 'OS バージョン',
-	'Menu:OSVersion+' => '',
 	'Class:Subnet/Tab:IPUsage' => 'IP 利用',
 	'Class:Subnet/Tab:IPUsage-explain' => 'インターフェースは、レンジ: <em>%1$s</em> から <em>%2$s</em>の中のIPを持っています。',
 	'Class:Subnet/Tab:FreeIPs' => 'フリーなIP',

+ 35 - 38
dictionaries/ja.dictionary.itop.ui.php

@@ -198,10 +198,10 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:URP_AttributeGrant/Attribute:attcode+' => '属性コード',
 	'BooleanLabel:yes' => 'はい',
 	'BooleanLabel:no' => 'いいえ',
-	'Menu:WelcomeMenu' => 'ようこそ',
-	'Menu:WelcomeMenu+' => 'ようこそ、iTopへ',
-	'Menu:WelcomeMenuPage' => 'ようこそ',
-	'Menu:WelcomeMenuPage+' => 'ようこそ、iTopへ',
+	'Menu:WelcomeMenu' => 'ようこそ', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenu+' => 'ようこそ、iTopへ', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage' => 'ようこそ', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage+' => 'ようこそ、iTopへ', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'ようこそ、iTopへ',
 	'UI:WelcomeMenu:LeftBlock' => '<p>iTopは、オープンソースの、完結したIT運用ポータルです。</p>
 <ul>以下を含みます。
@@ -670,9 +670,9 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI:UserManagement:GrantMatrix' => '権限マトリクス',
 	'UI:UserManagement:LinkBetween_User_And_Profile' => '%1$s と %2$s間のリンク',
 	'UI:UserManagement:LinkBetween_User_And_Org' => '%1$s と %2$s 間のリンク',
-	'Menu:AdminTools' => '管理ツール',
-	'Menu:AdminTools+' => '管理ツール',
-	'Menu:AdminTools?' => 'このツールは管理者プロフィールを持つユーザのみアクセスが可能です。',
+	'Menu:AdminTools' => '管理ツール', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools+' => '管理ツール', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools?' => 'このツールは管理者プロフィールを持つユーザのみアクセスが可能です。', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:ChangeManagementMenu' => '変更管理',
 	'UI:ChangeManagementMenu+' => '変更管理',
 	'UI:ChangeManagementMenu:Title' => '変更管理概要',
@@ -709,14 +709,14 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI-ContactsMenu-ContactsByLocation' => '場所別連絡先',
 	'UI-ContactsMenu-ContactsByType' => 'タイプ別連絡先',
 	'UI-ContactsMenu-ContactsByStatus' => '状態別連絡先',
-	'Menu:CSVImportMenu' => 'CSV インポート',
-	'Menu:CSVImportMenu+' => '一括作成/一括更新',
-	'Menu:DataModelMenu' => 'データモデル',
-	'Menu:DataModelMenu+' => 'データモデル概要',
-	'Menu:ExportMenu' => 'エクスポート',
-	'Menu:ExportMenu+' => '任意のクエリ結果をHTML、CSV、XMLでエクスポートする',
-	'Menu:NotificationsMenu' => '通知',
-	'Menu:NotificationsMenu+' => '通知の設定',
+	'Menu:CSVImportMenu' => 'CSV インポート', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:CSVImportMenu+' => '一括作成/一括更新', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu' => 'データモデル', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu+' => 'データモデル概要', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu' => 'エクスポート', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu+' => '任意のクエリ結果をHTML、CSV、XMLでエクスポートする', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu' => '通知', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu+' => '通知の設定', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => '<span class="hilite">通知</span>の設定',
 	'UI:NotificationsMenu:Help' => 'ヘルプ',
 	'UI:NotificationsMenu:HelpContent' => '<p>iTopでは、通知はすべてカスタマイズが可能です。通知は<i>トリガーとアクション</i>という二つのオブジェクトがベースになっています。
@@ -743,28 +743,25 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI:NotificationsMenu:OnStateLeave' => 'オブジェクトが指定状態から出た時',
 	'UI:NotificationsMenu:Actions' => 'アクション',
 	'UI:NotificationsMenu:AvailableActions' => '利用可能アクション',
-	'Menu:AuditCategories' => '監査カテゴリ',
-	'Menu:AuditCategories+' => '監査カテゴリ',
-	'Menu:Notifications:Title' => '監査カテゴリ',
-	'Menu:RunQueriesMenu' => 'クエリ実行',
-	'Menu:RunQueriesMenu+' => '任意のクエリを実行',
-	'Menu:QueryMenu' => 'クエリのフレーズブック',
-	'Menu:QueryMenu+' => 'クエリのフレーズブック',
-	'Menu:DataAdministration' => 'データ管理',
-	'Menu:DataAdministration+' => 'データ管理',
-	'Menu:UniversalSearchMenu' => '全検索',
-	'Menu:UniversalSearchMenu+' => '何か...検索',
-	'Menu:ApplicationLogMenu' => 'アプリケーションのログ',
-	'Menu:ApplicationLogMenu+' => 'アプリケーションのログ',
-	'Menu:ApplicationLogMenu:Title' => 'アプリケーションのログ',
-	'Menu:UserManagementMenu' => 'ユーザ管理',
-	'Menu:UserManagementMenu+' => 'ユーザ管理',
-	'Menu:ProfilesMenu' => 'プロフィール',
-	'Menu:ProfilesMenu+' => 'プロフィール',
-	'Menu:ProfilesMenu:Title' => 'プロフィール',
-	'Menu:UserAccountsMenu' => 'ユーザアカウント',
-	'Menu:UserAccountsMenu+' => 'ユーザアカウント',
-	'Menu:UserAccountsMenu:Title' => 'ユーザアカウント',
+	'Menu:AuditCategories' => '監査カテゴリ', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AuditCategories+' => '監査カテゴリ', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:Notifications:Title' => '監査カテゴリ', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu' => 'クエリ実行', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu+' => '任意のクエリを実行', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:QueryMenu' => 'クエリのフレーズブック', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:QueryMenu+' => 'クエリのフレーズブック', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration' => 'データ管理', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration+' => 'データ管理', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu' => '全検索', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu+' => '何か...検索', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu' => 'ユーザ管理', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu+' => 'ユーザ管理', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu' => 'プロフィール', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu+' => 'プロフィール', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu:Title' => 'プロフィール', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'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:PropertiesTab' => 'プロパティ',
@@ -960,7 +957,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI:ShortcutRenameDlg:Title' => 'ショートカットの名前変更',
 	'UI:ShortcutListDlg:Title' => 'このリストのショートカットを作成',
 	'UI:ShortcutDelete:Confirm' => 'このショートカットを本当に削除してもいいですか。',
-	'Menu:MyShortcuts' => '私のショートカット',
+	'Menu:MyShortcuts' => '私のショートカット', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => 'ショートカット',
 	'Class:Shortcut+' => '',
 	'Class:Shortcut/Attribute:name' => '名前',

+ 2 - 2
dictionaries/pt_br.dictionary.itop.core.php

@@ -624,8 +624,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Core:Synchro:NeverRun' => 'Este sincronismo nunca foi executado. Sem registo ainda.',
 	'Core:Synchro:SynchroEndedOn_Date' => 'A última sincronização terminou em %1$s.',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'A sincronização começou em %1$s ainda está em execução...',
-	'Menu:DataSources' => 'Fontes de dados de sincronização',
-	'Menu:DataSources+' => 'Todas fontes de dados de sincronização',
+	'Menu:DataSources' => 'Fontes de dados de sincronização', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => 'Todas fontes de dados de sincronização', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Ignoradas (%1$s)',
 	'Core:Synchro:label_repl_disappeared' => 'Desaparecido (%1$s)',
 	'Core:Synchro:label_repl_existing' => 'Saindo (%1$s)',

+ 35 - 39
dictionaries/pt_br.dictionary.itop.ui.php

@@ -310,10 +310,10 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'BooleanLabel:yes' => 'Sim',
 	'BooleanLabel:no' => 'Não',
-	'Menu:WelcomeMenu' => 'Bem-vindo ao iTop',
-	'Menu:WelcomeMenu+' => 'Bem-vindo ao iTop',
-	'Menu:WelcomeMenuPage' => 'Bem-vindo ao iTop',
-	'Menu:WelcomeMenuPage+' => 'Bem-vindo ao iTop',
+	'Menu:WelcomeMenu' => 'Bem-vindo ao iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenu+' => 'Bem-vindo ao iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage' => 'Bem-vindo ao iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage+' => 'Bem-vindo ao iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Bem-vindo ao iTop',
 
 	'UI:WelcomeMenu:LeftBlock' => '<p>iTop é um completo, OpenSource, portal de operação IT.</p>
@@ -824,9 +824,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Link entre %1$s e %2$s',
 	'UI:UserManagement:LinkBetween_User_And_Org' => 'Link entre %1$s e %2$s',
 	
-	'Menu:AdminTools' => 'Ferramentas Administrativas',
-	'Menu:AdminTools+' => 'Ferramentas Administrativas',
-	'Menu:AdminTools?' => 'Ferramentas acessíveis apenas para usuários com o perfil do administrador',
+	'Menu:AdminTools' => 'Ferramentas Administrativas', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools+' => 'Ferramentas Administrativas', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools?' => 'Ferramentas acessíveis apenas para usuários com o perfil do administrador', // Duplicated into itop-welcome-itil (will be removed from here...)
 
 	'UI:ChangeManagementMenu' => 'Gerenciamento Mudanças',
 	'UI:ChangeManagementMenu+' => 'Gerenciamento Mudanças',
@@ -872,17 +872,17 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI-ContactsMenu-ContactsByType' => 'Contatos por tipo',
 	'UI-ContactsMenu-ContactsByStatus' => 'Contatos por status',
 
-	'Menu:CSVImportMenu' => 'Importar CSV',
-	'Menu:CSVImportMenu+' => 'Criação ou atualização em massa',
+	'Menu:CSVImportMenu' => 'Importar CSV', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:CSVImportMenu+' => 'Criação ou atualização em massa', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:DataModelMenu' => 'Modelo Dados',
-	'Menu:DataModelMenu+' => 'Visão geral do Modelo Dados',
+	'Menu:DataModelMenu' => 'Modelo Dados', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu+' => 'Visão geral do Modelo Dados', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:ExportMenu' => 'Exportar',
-	'Menu:ExportMenu+' => 'Exportar o resultado de qualquer consulta em HTML, CSV ou XML',
+	'Menu:ExportMenu' => 'Exportar', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu+' => 'Exportar o resultado de qualquer consulta em HTML, CSV ou XML', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:NotificationsMenu' => 'Notificações',
-	'Menu:NotificationsMenu+' => 'Configuração de Notificações',
+	'Menu:NotificationsMenu' => 'Notificações', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu+' => 'Configuração de Notificações', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Configuração de <span class="hilite">Notificações</span>',
 	'UI:NotificationsMenu:Help' => 'Ajuda',
 	'UI:NotificationsMenu:HelpContent' => '<p>As Notificações são totalmente personalizáveis​​. Elas são baseadas em dois conjuntos de objetos: <i>Gatilhos e Ações</i>.</p>
@@ -910,36 +910,32 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:NotificationsMenu:Actions' => 'Ações',
 	'UI:NotificationsMenu:AvailableActions' => 'Available actions',
 	
-	'Menu:AuditCategories' => 'Categoria Auditorias',
-	'Menu:AuditCategories+' => 'Categoria Auditorias',
-	'Menu:Notifications:Title' => 'Categoria Auditorias',
+	'Menu:AuditCategories' => 'Categoria Auditorias', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AuditCategories+' => 'Categoria Auditorias', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:Notifications:Title' => 'Categoria Auditorias', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:RunQueriesMenu' => 'Executar consultas',
-	'Menu:RunQueriesMenu+' => 'Executar qualquer consulta',
+	'Menu:RunQueriesMenu' => 'Executar consultas', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu+' => 'Executar qualquer consulta', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:QueryMenu' => 'Consulta  definida',
-	'Menu:QueryMenu+' => 'Consulta  definida',
+	'Menu:QueryMenu' => 'Consulta  definida', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:QueryMenu+' => 'Consulta  definida', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:DataAdministration' => 'Administração Dados',
-	'Menu:DataAdministration+' => 'Administração Dados',
+	'Menu:DataAdministration' => 'Administração Dados', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration+' => 'Administração Dados', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:UniversalSearchMenu' => 'Pesquisa Universal',
-	'Menu:UniversalSearchMenu+' => 'Pesquisar por nada...',
+	'Menu:UniversalSearchMenu' => 'Pesquisa Universal', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu+' => 'Pesquisar por nada...', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:ApplicationLogMenu' => 'Log aplicação',
-	'Menu:ApplicationLogMenu+' => 'Log aplicação',
-	'Menu:ApplicationLogMenu:Title' => 'Log aplicação',
+	'Menu:UserManagementMenu' => 'Gerenciamento Usuários', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu+' => 'Gerenciamento Usuários', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:UserManagementMenu' => 'Gerenciamento Usuários',
-	'Menu:UserManagementMenu+' => 'Gerenciamento Usuários',
+	'Menu:ProfilesMenu' => 'Perfis', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu+' => 'Perfis', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu:Title' => 'Perfis', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:ProfilesMenu' => 'Perfis',
-	'Menu:ProfilesMenu+' => 'Perfis',
-	'Menu:ProfilesMenu:Title' => 'Perfis',
-
-	'Menu:UserAccountsMenu' => 'Contas usuários',
-	'Menu:UserAccountsMenu+' => 'Contas usuários',
-	'Menu:UserAccountsMenu:Title' => 'Contas usuários',	
+	'Menu:UserAccountsMenu' => 'Contas usuários', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'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',
@@ -1171,7 +1167,7 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:ShortcutRenameDlg:Title' => 'Renomear o atalho',
 	'UI:ShortcutListDlg:Title' => 'Criar um atalho para a lista',
 	'UI:ShortcutDelete:Confirm' => 'Por favor, confirme que você deseja excluir o(s) atalho(s).',
-	'Menu:MyShortcuts' => 'Meus atalhos',
+	'Menu:MyShortcuts' => 'Meus atalhos', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => 'Atalho',
 	'Class:Shortcut+' => '',
 	'Class:Shortcut/Attribute:name' => 'Nome',

+ 2 - 2
dictionaries/ru.dictionary.itop.core.php

@@ -619,8 +619,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Core:Synchro:NeverRun' => 'Синхронизация не запускалась. Логи отсутсвуют.~~',
 	'Core:Synchro:SynchroEndedOn_Date' => 'Синхронизация была закончена в %1$s.~~',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Синхронизация запущена в %1$s сейчас в процессе...~~',
-	'Menu:DataSources' => 'Синхронизация данных',
-	'Menu:DataSources+' => 'All Synchronization Data Sources',
+	'Menu:DataSources' => 'Синхронизация данных', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => 'All Synchronization Data Sources', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Игнор. (%1$s)~~',
 	'Core:Synchro:label_repl_disappeared' => 'Невид. (%1$s)~~',
 	'Core:Synchro:label_repl_existing' => 'Existing (%1$s)~~',

+ 35 - 39
dictionaries/ru.dictionary.itop.ui.php

@@ -306,10 +306,10 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'BooleanLabel:yes' => 'yes',
 	'BooleanLabel:no' => 'no',
-	'Menu:WelcomeMenu' => 'Добро пожаловать',
-	'Menu:WelcomeMenu+' => 'Добро пожаловать в iTop',
-	'Menu:WelcomeMenuPage' => 'Добро пожаловать',
-	'Menu:WelcomeMenuPage+' => 'Добро пожаловать в iTop',
+	'Menu:WelcomeMenu' => 'Добро пожаловать', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenu+' => 'Добро пожаловать в iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage' => 'Добро пожаловать', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage+' => 'Добро пожаловать в iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Добро пожаловать в iTop',
 
 	'UI:WelcomeMenu:LeftBlock' => '<p>iTop является порталом оперативного централизованного управления IT инфраструктурой с открытым исходным кодом.</p>
@@ -820,9 +820,9 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Связь между %1$s и %2$s',
 	'UI:UserManagement:LinkBetween_User_And_Org' => 'Связь между %1$s и %2$s',
 	
-	'Menu:AdminTools' => 'Инструменты админа',
-	'Menu:AdminTools+' => 'Административные инструменты',
-	'Menu:AdminTools?' => 'Инструменты доступны только для пользователей, имеющих профиль администратора',
+	'Menu:AdminTools' => 'Инструменты админа', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools+' => 'Административные инструменты', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools?' => 'Инструменты доступны только для пользователей, имеющих профиль администратора', // Duplicated into itop-welcome-itil (will be removed from here...)
 
 	'UI:ChangeManagementMenu' => 'Управление изменениями',
 	'UI:ChangeManagementMenu+' => 'Управление изменениями',
@@ -868,17 +868,17 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI-ContactsMenu-ContactsByType' => 'Договора по типу',
 	'UI-ContactsMenu-ContactsByStatus' => 'Договора по статусу',
 
-	'Menu:CSVImportMenu' => 'Импорт CSV',
-	'Menu:CSVImportMenu+' => 'Пакетное создание или обновление',
+	'Menu:CSVImportMenu' => 'Импорт CSV', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:CSVImportMenu+' => 'Пакетное создание или обновление', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:DataModelMenu' => 'Модель данных',
-	'Menu:DataModelMenu+' => 'Обзор модели данных',
+	'Menu:DataModelMenu' => 'Модель данных', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu+' => 'Обзор модели данных', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:ExportMenu' => 'Экспорт',
-	'Menu:ExportMenu+' => 'Экспорт результатов любого запроса в HTML, CSV или XML',
+	'Menu:ExportMenu' => 'Экспорт', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu+' => 'Экспорт результатов любого запроса в HTML, CSV или XML', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:NotificationsMenu' => 'Уведомления',
-	'Menu:NotificationsMenu+' => 'Конфигурация уведомлений',
+	'Menu:NotificationsMenu' => 'Уведомления', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu+' => 'Конфигурация уведомлений', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Конфигурация <span class="hilite">Уведомлений</span>',
 	'UI:NotificationsMenu:Help' => 'Помощь',
 	'UI:NotificationsMenu:HelpContent' => '<p>В iTop уведомления полностью настраиваемые. Они основаны на двух наборах объектов: <i>триггеры</i> и <i>действия</i>.</p>
@@ -904,36 +904,32 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:NotificationsMenu:Actions' => 'Действия',
 	'UI:NotificationsMenu:AvailableActions' => 'Доступные действия',
 	
-	'Menu:AuditCategories' => 'Категории аудита',
-	'Menu:AuditCategories+' => 'Категории аудита',
-	'Menu:Notifications:Title' => 'Категории аудита',
+	'Menu:AuditCategories' => 'Категории аудита', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AuditCategories+' => 'Категории аудита', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:Notifications:Title' => 'Категории аудита', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:RunQueriesMenu' => 'Выполнение запросов',
-	'Menu:RunQueriesMenu+' => 'Выполнение любых запросов',
+	'Menu:RunQueriesMenu' => 'Выполнение запросов', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu+' => 'Выполнение любых запросов', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:QueryMenu' => 'Книга запросов',
-	'Menu:QueryMenu+' => 'Query phrasebook',
+	'Menu:QueryMenu' => 'Книга запросов', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:QueryMenu+' => 'Query phrasebook', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:DataAdministration' => 'Административные данные',
-	'Menu:DataAdministration+' => 'Административные данные',
+	'Menu:DataAdministration' => 'Административные данные', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration+' => 'Административные данные', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:UniversalSearchMenu' => 'Универсальный поиск',
-	'Menu:UniversalSearchMenu+' => 'Поиск чего угодно...',
+	'Menu:UniversalSearchMenu' => 'Универсальный поиск', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu+' => 'Поиск чего угодно...', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:ApplicationLogMenu' => 'Логгирование приложения',
-	'Menu:ApplicationLogMenu+' => 'Логгирование приложения',
-	'Menu:ApplicationLogMenu:Title' => 'Логгирование приложения',
+	'Menu:UserManagementMenu' => 'Управление пользователями', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu+' => 'Управление пользователями', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:UserManagementMenu' => 'Управление пользователями',
-	'Menu:UserManagementMenu+' => 'Управление пользователями',
+	'Menu:ProfilesMenu' => 'Профили', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu+' => 'Профили', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu:Title' => 'Профили', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:ProfilesMenu' => 'Профили',
-	'Menu:ProfilesMenu+' => 'Профили',
-	'Menu:ProfilesMenu:Title' => 'Профили',
-
-	'Menu:UserAccountsMenu' => 'Учетные записи пользователей',
-	'Menu:UserAccountsMenu+' => 'Учетные записи пользователей',
-	'Menu:UserAccountsMenu:Title' => 'Учетные записи пользователей',	
+	'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',
@@ -1164,7 +1160,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:ShortcutRenameDlg:Title' => 'Переименовать ссылку',
 	'UI:ShortcutListDlg:Title' => 'Добавить в избранное ссылку на список',
 	'UI:ShortcutDelete:Confirm' => 'Подтвердите удаление ссылки (ссылок).',
-	'Menu:MyShortcuts' => 'Избранное',
+	'Menu:MyShortcuts' => 'Избранное', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => 'Ссылка',
 	'Class:Shortcut+' => '',
 	'Class:Shortcut/Attribute:name' => 'Название',

+ 32 - 36
dictionaries/tr.dictionary.itop.ui.php

@@ -292,10 +292,10 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'BooleanLabel:yes' => 'evet',
 	'BooleanLabel:no' => 'hayır',
-	'Menu:WelcomeMenu' => 'Hoşgeldiniz',
-	'Menu:WelcomeMenu+' => 'iTop\'a Hoşgeldiniz',
-	'Menu:WelcomeMenuPage' => 'Hoşgeldiniz',
-	'Menu:WelcomeMenuPage+' => 'iTop\'a Hoşgeldiniz',
+	'Menu:WelcomeMenu' => 'Hoşgeldiniz', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenu+' => 'iTop\'a Hoşgeldiniz', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage' => 'Hoşgeldiniz', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage+' => 'iTop\'a Hoşgeldiniz', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'iTop\'a Hoşgeldiniz',
 
 	'UI:WelcomeMenu:LeftBlock' => '<p>iTop açık kaynak Bilişim İşlem Potalıdır.</p>
@@ -710,9 +710,9 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI:UserManagement:LinkBetween_User_And_Profile' => '%1$s ve %2$s arasındaki ilişki',
 	'UI:UserManagement:LinkBetween_User_And_Org' => '%1$s ve %2$s arasındaki ilişki',
 
-	'Menu:AdminTools' => 'Yönetim Araçları',
-	'Menu:AdminTools+' => 'Yönetim Araçları',
-	'Menu:AdminTools?' => 'Yönetici profiline izin verilen araçlar',
+	'Menu:AdminTools' => 'Yönetim Araçları', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools+' => 'Yönetim Araçları', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools?' => 'Yönetici profiline izin verilen araçlar', // Duplicated into itop-welcome-itil (will be removed from here...)
 
 	'UI:ChangeManagementMenu' => 'Değişiklik Yönetimi',
 	'UI:ChangeManagementMenu+' => 'Değişiklik Yönetimi',
@@ -758,17 +758,17 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI-ContactsMenu-ContactsByType' => 'Tipine göre irtibatlar',
 	'UI-ContactsMenu-ContactsByStatus' => 'Durumuna göre irtibatlar',
 
-	'Menu:CSVImportMenu' => 'CSV dışardan al',
-	'Menu:CSVImportMenu+' => 'Çoklu yaratım veya güncelleme',
+	'Menu:CSVImportMenu' => 'CSV dışardan al', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:CSVImportMenu+' => 'Çoklu yaratım veya güncelleme', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:DataModelMenu' => 'Veri Modeli',
-	'Menu:DataModelMenu+' => 'Veri Modeli Özeti',
+	'Menu:DataModelMenu' => 'Veri Modeli', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu+' => 'Veri Modeli Özeti', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:ExportMenu' => 'Dışarı ver',
-	'Menu:ExportMenu+' => 'Sorgu sonucunu HTML, CSV veya XML olarak dışarı aktar',
+	'Menu:ExportMenu' => 'Dışarı ver', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu+' => 'Sorgu sonucunu HTML, CSV veya XML olarak dışarı aktar', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:NotificationsMenu' => 'Uyarılar',
-	'Menu:NotificationsMenu+' => 'Uyarıların yapılandırılması',
+	'Menu:NotificationsMenu' => 'Uyarılar', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu+' => 'Uyarıların yapılandırılması', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => '<span class="hilite">Uyarıların</span> yapılandırılması',
 	'UI:NotificationsMenu:Help' => 'Yardım',
 	'UI:NotificationsMenu:HelpContent' => '<p>In iTop uyarı mekanizması ihtiyaca göre uyarlanabilir. Uyarılar iki tip nesne üzerine kurulmuştur: <i>tetikleme (triggers) ve işlemler (actions)</i>.</p>
@@ -794,33 +794,29 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'UI:NotificationsMenu:Actions' => 'İşlemler',
 	'UI:NotificationsMenu:AvailableActions' => 'Kullanılabilir işlemler',
 
-	'Menu:AuditCategories' => 'Denetleme Kategorileri',
-	'Menu:AuditCategories+' => 'Denetleme Kategorileri',
-	'Menu:Notifications:Title' => 'Denetleme Kategorileri',
+	'Menu:AuditCategories' => 'Denetleme Kategorileri', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AuditCategories+' => 'Denetleme Kategorileri', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:Notifications:Title' => 'Denetleme Kategorileri', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:RunQueriesMenu' => 'Sorgu çalıştır',
-	'Menu:RunQueriesMenu+' => 'Sorgu çalıştır',
+	'Menu:RunQueriesMenu' => 'Sorgu çalıştır', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu+' => 'Sorgu çalıştır', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:DataAdministration' => 'Veri Yönetimi',
-	'Menu:DataAdministration+' => 'Veri Yönetimi',
+	'Menu:DataAdministration' => 'Veri Yönetimi', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration+' => 'Veri Yönetimi', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:UniversalSearchMenu' => 'Genel sorgu',
-	'Menu:UniversalSearchMenu+' => 'Herhangi bir arama...',
+	'Menu:UniversalSearchMenu' => 'Genel sorgu', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu+' => 'Herhangi bir arama...', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:ApplicationLogMenu' => 'Uygulama olay kayıtları',
-	'Menu:ApplicationLogMenu+' => 'Uygulama olay kayıtları',
-	'Menu:ApplicationLogMenu:Title' => 'Uygulama olay kayıtları',
+	'Menu:UserManagementMenu' => 'Kullanıcı Yönetimi', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu+' => 'Kullanıcı Yönetimi', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:UserManagementMenu' => 'Kullanıcı Yönetimi',
-	'Menu:UserManagementMenu+' => 'Kullanıcı Yönetimi',
+	'Menu:ProfilesMenu' => 'Profiller', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu+' => 'Profiller', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu:Title' => 'Profiller', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:ProfilesMenu' => 'Profiller',
-	'Menu:ProfilesMenu+' => 'Profiller',
-	'Menu:ProfilesMenu:Title' => 'Profiller',
-
-	'Menu:UserAccountsMenu' => 'Kullanıcı Hesapları',
-	'Menu:UserAccountsMenu+' => 'Kullanıcı Hesapları',
-	'Menu:UserAccountsMenu:Title' => 'Kullanıcı Hesapları',
+	'Menu:UserAccountsMenu' => 'Kullanıcı Hesapları', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'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',

+ 32 - 36
dictionaries/zh.dictionary.itop.ui.php

@@ -291,10 +291,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'BooleanLabel:yes' => '是',
 	'BooleanLabel:no' => '否',
-	'Menu:WelcomeMenu' => '欢迎',
-	'Menu:WelcomeMenu+' => '欢迎来到iTop',
-	'Menu:WelcomeMenuPage' => '欢迎',
-	'Menu:WelcomeMenuPage+' => '欢迎来到iTop',
+	'Menu:WelcomeMenu' => '欢迎', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenu+' => '欢迎来到iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage' => '欢迎', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage+' => '欢迎来到iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => '欢迎来到iTop',
 
 	'UI:WelcomeMenu:LeftBlock' => '<p>iTop 是完全的, 开发源码的, IT 操作门户.</p>
@@ -709,9 +709,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:UserManagement:LinkBetween_User_And_Profile' => '链接 %1$s 和 %2$s',
 	'UI:UserManagement:LinkBetween_User_And_Org' => '链接 %1$s 和 %2$s',
 	
-	'Menu:AdminTools' => '管理工具',
-	'Menu:AdminTools+' => '管理工具',
-	'Menu:AdminTools?' => '具有系统管理员简档的用户才能获得的工具',
+	'Menu:AdminTools' => '管理工具', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools+' => '管理工具', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools?' => '具有系统管理员简档的用户才能获得的工具', // Duplicated into itop-welcome-itil (will be removed from here...)
 
 	'UI:ChangeManagementMenu' => '变更管理',
 	'UI:ChangeManagementMenu+' => '变更管理',
@@ -757,17 +757,17 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI-ContactsMenu-ContactsByType' => '按类别划分联系人',
 	'UI-ContactsMenu-ContactsByStatus' => '按状态划分联系人',
 
-	'Menu:CSVImportMenu' => 'CSV 导入',
-	'Menu:CSVImportMenu+' => '大批量创建或修改',
+	'Menu:CSVImportMenu' => 'CSV 导入', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:CSVImportMenu+' => '大批量创建或修改', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:DataModelMenu' => '数据模型',
-	'Menu:DataModelMenu+' => '数据模型概览',
+	'Menu:DataModelMenu' => '数据模型', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu+' => '数据模型概览', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:ExportMenu' => '导出',
-	'Menu:ExportMenu+' => '以HTML, CSV or XML格式导出任何查询的结果',
+	'Menu:ExportMenu' => '导出', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu+' => '以HTML, CSV or XML格式导出任何查询的结果', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:NotificationsMenu' => '通知',
-	'Menu:NotificationsMenu+' => '通知的配置',
+	'Menu:NotificationsMenu' => '通知', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu+' => '通知的配置', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => '配置 <span class="hilite">通知</span>',
 	'UI:NotificationsMenu:Help' => '帮助',
 	'UI:NotificationsMenu:HelpContent' => '<p>在 iTop 中, 通知可以被完全客户化定制. 它们是基于两个对象集: <i>触发器和动作</i>.</p>
@@ -793,33 +793,29 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:NotificationsMenu:Actions' => '动作',
 	'UI:NotificationsMenu:AvailableActions' => '有效的动作',
 	
-	'Menu:AuditCategories' => '审计类目',
-	'Menu:AuditCategories+' => '审计类目',
-	'Menu:Notifications:Title' => '审计类目',
+	'Menu:AuditCategories' => '审计类目', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AuditCategories+' => '审计类目', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:Notifications:Title' => '审计类目', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:RunQueriesMenu' => '运行查询',
-	'Menu:RunQueriesMenu+' => '运行任何查询',
+	'Menu:RunQueriesMenu' => '运行查询', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu+' => '运行任何查询', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:DataAdministration' => '数据管理',
-	'Menu:DataAdministration+' => '数据管理',
+	'Menu:DataAdministration' => '数据管理', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration+' => '数据管理', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:UniversalSearchMenu' => '通用搜索',
-	'Menu:UniversalSearchMenu+' => '搜索所有...',
+	'Menu:UniversalSearchMenu' => '通用搜索', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu+' => '搜索所有...', // Duplicated into itop-welcome-itil (will be removed from here...)
 	
-	'Menu:ApplicationLogMenu' => 'Log de l\'application',
-	'Menu:ApplicationLogMenu+' => 'Log de l\'application',
-	'Menu:ApplicationLogMenu:Title' => 'Log de l\'application',
+	'Menu:UserManagementMenu' => '用户管理', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu+' => '用户管理', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:UserManagementMenu' => '用户管理',
-	'Menu:UserManagementMenu+' => '用户管理',
+	'Menu:ProfilesMenu' => '简档', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu+' => '简档', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu:Title' => '简档', // Duplicated into itop-welcome-itil (will be removed from here...)
 
-	'Menu:ProfilesMenu' => '简档',
-	'Menu:ProfilesMenu+' => '简档',
-	'Menu:ProfilesMenu:Title' => '简档',
-
-	'Menu:UserAccountsMenu' => '用户帐户',
-	'Menu:UserAccountsMenu+' => '用户帐户',
-	'Menu:UserAccountsMenu:Title' => '用户帐户',	
+	'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 version %1$s',
 	'UI:iTopVersion:Long' => 'iTop version %1$s-%2$s built on %3$s',