diff --git a/addons/userrights/userrightsprofile.class.inc.php b/addons/userrights/userrightsprofile.class.inc.php index 18117af0b..181e35d73 100644 --- a/addons/userrights/userrightsprofile.class.inc.php +++ b/addons/userrights/userrightsprofile.class.inc.php @@ -221,7 +221,7 @@ class URP_UserProfile extends UserRightsBaseClassGUI ( "category" => "addon/userrights,grant_by_profile", "key_type" => "autoincrement", - "name_attcode" => "userid", + "name_attcode" => array("userlogin", "profile"), "state_attcode" => "", "reconc_keys" => array(), "db_table" => "priv_urp_userprofile", @@ -246,11 +246,6 @@ class URP_UserProfile extends UserRightsBaseClassGUI MetaModel::Init_SetZListItems('advanced_search', array('userid', 'profileid')); // Criteria of the advanced search form } - public function GetName() - { - return Dict::Format('UI:UserManagement:LinkBetween_User_And_Profile', $this->Get('userlogin'), $this->Get('profile')); - } - public function CheckToDelete(&$oDeletionPlan) { if (MetaModel::GetConfig()->Get('demo_mode')) { @@ -362,7 +357,7 @@ class URP_UserOrg extends UserRightsBaseClassGUI ( "category" => "addon/userrights,grant_by_profile", "key_type" => "autoincrement", - "name_attcode" => "userid", + "name_attcode" => array("userlogin", "allowed_org_name"), "state_attcode" => "", "reconc_keys" => array(), "db_table" => "priv_urp_userorg", @@ -387,12 +382,6 @@ class URP_UserOrg extends UserRightsBaseClassGUI MetaModel::Init_SetZListItems('advanced_search', array('userid', 'allowed_org_id')); // Criteria of the advanced search form } - public function GetName() - { - return Dict::Format('UI:UserManagement:LinkBetween_User_And_Org', $this->Get('userlogin'), $this->Get('allowed_org_name')); - } - - protected function OnInsert() { $this->CheckIfOrgIsAllowed(); diff --git a/addons/userrights/userrightsprofile.db.class.inc.php b/addons/userrights/userrightsprofile.db.class.inc.php index 9cbb06c83..ac5b2277b 100644 --- a/addons/userrights/userrightsprofile.db.class.inc.php +++ b/addons/userrights/userrightsprofile.db.class.inc.php @@ -327,7 +327,7 @@ class URP_UserProfile extends UserRightsBaseClassGUI ( "category" => "addon/userrights", "key_type" => "autoincrement", - "name_attcode" => "userid", + "name_attcode" => array("userlogin", "profile"), "state_attcode" => "", "reconc_keys" => array(), "db_table" => "priv_urp_userprofile", @@ -351,11 +351,6 @@ class URP_UserProfile extends UserRightsBaseClassGUI MetaModel::Init_SetZListItems('standard_search', array('userid', 'profileid')); // Criteria of the std search form MetaModel::Init_SetZListItems('advanced_search', array('userid', 'profileid')); // Criteria of the advanced search form } - - public function GetName() - { - return Dict::Format('UI:UserManagement:LinkBetween_User_And_Profile', $this->Get('userlogin'), $this->Get('profile')); - } } class URP_UserOrg extends UserRightsBaseClassGUI @@ -366,7 +361,7 @@ class URP_UserOrg extends UserRightsBaseClassGUI ( "category" => "addon/userrights", "key_type" => "autoincrement", - "name_attcode" => "userid", + "name_attcode" => array("userlogin", "allowed_org_name"), "state_attcode" => "", "reconc_keys" => array(), "db_table" => "priv_urp_userorg", @@ -390,11 +385,6 @@ class URP_UserOrg extends UserRightsBaseClassGUI MetaModel::Init_SetZListItems('standard_search', array('userid', 'allowed_org_id')); // Criteria of the std search form MetaModel::Init_SetZListItems('advanced_search', array('userid', 'allowed_org_id')); // Criteria of the advanced search form } - - public function GetName() - { - return Dict::Format('UI:UserManagement:LinkBetween_User_And_Org', $this->Get('userlogin'), $this->Get('allowed_org_name')); - } } diff --git a/addons/userrights/userrightsprojection.class.inc.php b/addons/userrights/userrightsprojection.class.inc.php index d247fa3fb..61fb07fe6 100644 --- a/addons/userrights/userrightsprojection.class.inc.php +++ b/addons/userrights/userrightsprojection.class.inc.php @@ -270,7 +270,7 @@ class URP_UserProfile extends UserRightsBaseClass ( "category" => "addon/userrights", "key_type" => "autoincrement", - "name_attcode" => "userid", + "name_attcode" => array("userlogin", "profile"), "state_attcode" => "", "reconc_keys" => array(), "db_table" => "priv_urp_userprofile", @@ -294,11 +294,6 @@ class URP_UserProfile extends UserRightsBaseClass MetaModel::Init_SetZListItems('standard_search', array('userid', 'profileid')); // Criteria of the std search form MetaModel::Init_SetZListItems('advanced_search', array('userid', 'profileid')); // Criteria of the advanced search form } - - public function GetName() - { - return Dict::Format('UI:UserManagement:LinkBetween_User_And_Profile', $this->Get('userlogin'), $this->Get('profile')); - } } diff --git a/dictionaries/cs.dictionary.itop.ui.php b/dictionaries/cs.dictionary.itop.ui.php index a3b1ba38d..6d29bf725 100755 --- a/dictionaries/cs.dictionary.itop.ui.php +++ b/dictionaries/cs.dictionary.itop.ui.php @@ -167,6 +167,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'Class:URP_UserProfile' => 'Uživatel/Profil', 'Class:URP_UserProfile+' => '', + 'Class:URP_UserProfile/Name' => 'Spojení mezi uživatelem %1$s a profilem %2$s', 'Class:URP_UserProfile/Attribute:userid' => 'Uživatel', 'Class:URP_UserProfile/Attribute:userid+' => '', 'Class:URP_UserProfile/Attribute:userlogin' => 'Přihlašovací jméno', @@ -187,6 +188,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'Class:URP_UserOrg' => 'Přístupné organizace', 'Class:URP_UserOrg+' => '', + 'Class:URP_UserOrg/Name' => 'Spojení mezi uživatelem %1$s a organizací %2$s', 'Class:URP_UserOrg/Attribute:userid' => 'Uživatel', 'Class:URP_UserOrg/Attribute:userid+' => '', 'Class:URP_UserOrg/Attribute:userlogin' => 'Přihlašovací jméno', @@ -904,8 +906,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'UI:UserManagement:NoLifeCycleApplicable' => 'nedefinováno', 'UI:UserManagement:NoLifeCycleApplicable+' => 'Pro tuto třídu nebyl definován žádný životní cyklus', 'UI:UserManagement:GrantMatrix' => 'Matice oprávnění', - 'UI:UserManagement:LinkBetween_User_And_Profile' => 'Spojení mezi uživatelem %1$s a profilem %2$s', - 'UI:UserManagement:LinkBetween_User_And_Org' => 'Spojení mezi uživatelem %1$s a organizací %2$s', 'Menu:AdminTools' => 'Administrace', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools+' => 'Nástroje pro administraci', // Duplicated into itop-welcome-itil (will be removed from here...) diff --git a/dictionaries/da.dictionary.itop.ui.php b/dictionaries/da.dictionary.itop.ui.php index 833ab50d9..acb6b2094 100644 --- a/dictionaries/da.dictionary.itop.ui.php +++ b/dictionaries/da.dictionary.itop.ui.php @@ -156,6 +156,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array( Dict::Add('DA DA', 'Danish', 'Dansk', array( 'Class:URP_UserProfile' => 'Brugerprofil', 'Class:URP_UserProfile+' => 'Brugerprofil', + 'Class:URP_UserProfile/Name' => 'Link mellem %1$s and %2$s', 'Class:URP_UserProfile/Attribute:userid' => 'Bruger', 'Class:URP_UserProfile/Attribute:userid+' => 'Brugerkonto', 'Class:URP_UserProfile/Attribute:userlogin' => 'Login', @@ -176,6 +177,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array( Dict::Add('DA DA', 'Danish', 'Dansk', array( 'Class:URP_UserOrg' => 'Bruger organisation(er)', 'Class:URP_UserOrg+' => 'Tilladte organisation(er)', + 'Class:URP_UserOrg/Name' => 'Link mellem %1$s og %2$s', 'Class:URP_UserOrg/Attribute:userid' => 'Bruger', 'Class:URP_UserOrg/Attribute:userid+' => '', 'Class:URP_UserOrg/Attribute:userlogin' => 'Login', @@ -893,8 +895,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array( 'UI:UserManagement:NoLifeCycleApplicable' => 'N/A', 'UI:UserManagement:NoLifeCycleApplicable+' => '', 'UI:UserManagement:GrantMatrix' => 'Grant Matrix', - 'UI:UserManagement:LinkBetween_User_And_Profile' => 'Link mellem %1$s and %2$s', - 'UI:UserManagement:LinkBetween_User_And_Org' => 'Link mellem %1$s og %2$s', 'Menu:AdminTools' => 'Admin værktøjer', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools+' => 'Administration tools~~', // Duplicated into itop-welcome-itil (will be removed from here...) diff --git a/dictionaries/de.dictionary.itop.ui.php b/dictionaries/de.dictionary.itop.ui.php index 9d0f0c2a5..1e943b5d9 100644 --- a/dictionaries/de.dictionary.itop.ui.php +++ b/dictionaries/de.dictionary.itop.ui.php @@ -156,6 +156,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( Dict::Add('DE DE', 'German', 'Deutsch', array( 'Class:URP_UserProfile' => 'Benutzerprofil', 'Class:URP_UserProfile+' => 'Benutzerprofil', + 'Class:URP_UserProfile/Name' => 'Verbindung zwischen %1$s und %2$s', 'Class:URP_UserProfile/Attribute:userid' => 'Benutzer', 'Class:URP_UserProfile/Attribute:userid+' => 'Benutzerkonto', 'Class:URP_UserProfile/Attribute:userlogin' => 'Login', @@ -176,6 +177,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( Dict::Add('DE DE', 'German', 'Deutsch', array( 'Class:URP_UserOrg' => 'Benutzerorganisationen', 'Class:URP_UserOrg+' => 'Zulässige Organisationen', + 'Class:URP_UserOrg/Name' => 'Verbindung zwischen %1$s und %2$s', 'Class:URP_UserOrg/Attribute:userid' => 'User', 'Class:URP_UserOrg/Attribute:userid+' => '', 'Class:URP_UserOrg/Attribute:userlogin' => 'Login', @@ -893,8 +895,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( 'UI:UserManagement:NoLifeCycleApplicable' => 'Nicht verfügbar', 'UI:UserManagement:NoLifeCycleApplicable+' => 'Kein Lebenszyklus wurde für diese Klasse definiert.', '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', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools+' => 'Administrationswerkzeuge', // Duplicated into itop-welcome-itil (will be removed from here...) diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php index 306d30870..912112289 100644 --- a/dictionaries/en.dictionary.itop.ui.php +++ b/dictionaries/en.dictionary.itop.ui.php @@ -171,6 +171,7 @@ Dict::Add('EN US', 'English', 'English', array( Dict::Add('EN US', 'English', 'English', array( 'Class:URP_UserProfile' => 'User to profile', 'Class:URP_UserProfile+' => 'user profiles', + 'Class:URP_UserProfile/Name' => 'Link between %1$s and %2$s', 'Class:URP_UserProfile/Attribute:userid' => 'User', 'Class:URP_UserProfile/Attribute:userid+' => 'user account', 'Class:URP_UserProfile/Attribute:userlogin' => 'Login', @@ -191,6 +192,7 @@ Dict::Add('EN US', 'English', 'English', array( Dict::Add('EN US', 'English', 'English', array( 'Class:URP_UserOrg' => 'User organizations', 'Class:URP_UserOrg+' => 'Allowed organizations', + 'Class:URP_UserOrg/Name' => 'LinkGG between %1$s and %2$s', 'Class:URP_UserOrg/Attribute:userid' => 'User', 'Class:URP_UserOrg/Attribute:userid+' => 'user account', 'Class:URP_UserOrg/Attribute:userlogin' => 'Login', @@ -916,8 +918,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating 'UI:UserManagement:NoLifeCycleApplicable' => 'N/A', 'UI:UserManagement:NoLifeCycleApplicable+' => 'No lifecycle has been defined for this class', 'UI:UserManagement:GrantMatrix' => 'Grant Matrix', - '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' => 'Administration', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools+' => 'Administration tools', // Duplicated into itop-welcome-itil (will be removed from here...) diff --git a/dictionaries/es_cr.dictionary.itop.ui.php b/dictionaries/es_cr.dictionary.itop.ui.php index d1af315ae..44796aa21 100644 --- a/dictionaries/es_cr.dictionary.itop.ui.php +++ b/dictionaries/es_cr.dictionary.itop.ui.php @@ -167,6 +167,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array( Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array( 'Class:URP_UserProfile' => 'Asignación de Perfiles', 'Class:URP_UserProfile+' => 'Perfiles de Usuarios', + 'Class:URP_UserProfile/Name' => 'Vinculo entre %1$s y %2$s', 'Class:URP_UserProfile/Attribute:userid' => 'Usuario', 'Class:URP_UserProfile/Attribute:userid+' => 'Cuenta de usuario', 'Class:URP_UserProfile/Attribute:userlogin' => 'Clave de usuario', @@ -187,6 +188,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array( Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array( 'Class:URP_UserOrg' => 'Organizaciones de Usuario', 'Class:URP_UserOrg+' => 'Organizaciones Permitidas', + 'Class:URP_UserOrg/Name' => 'Vínculo entre %1$s y %2$s', 'Class:URP_UserOrg/Attribute:userid' => 'Usuario', 'Class:URP_UserOrg/Attribute:userid+' => 'Cuenta de usuario', 'Class:URP_UserOrg/Attribute:userlogin' => 'Login', @@ -904,8 +906,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array( 'UI:UserManagement:NoLifeCycleApplicable' => 'N/A', 'UI:UserManagement:NoLifeCycleApplicable+' => 'No se ha definido ciclo de vida para esta clase', 'UI:UserManagement:GrantMatrix' => 'Matriz de Acceso', - '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', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools+' => 'Herramientas Administrativas', // Duplicated into itop-welcome-itil (will be removed from here...) diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php index 06a66b0ed..694443cf2 100644 --- a/dictionaries/fr.dictionary.itop.ui.php +++ b/dictionaries/fr.dictionary.itop.ui.php @@ -156,6 +156,7 @@ Dict::Add('FR FR', 'French', 'Français', array( Dict::Add('FR FR', 'French', 'Français', array( 'Class:URP_UserProfile' => 'Utilisateur/Profil', 'Class:URP_UserProfile+' => '', + 'Class:URP_UserProfile/Name' => 'Lien entre %1$s et %2$s', 'Class:URP_UserProfile/Attribute:userid' => 'Utilisateur', 'Class:URP_UserProfile/Attribute:userid+' => '', 'Class:URP_UserProfile/Attribute:userlogin' => 'Login', @@ -176,6 +177,7 @@ Dict::Add('FR FR', 'French', 'Français', array( Dict::Add('FR FR', 'French', 'Français', array( 'Class:URP_UserOrg' => 'Utilisateur/Organisation', 'Class:URP_UserOrg+' => 'Organisations permises pour l\'utilisateur', + 'Class:URP_UserOrg/Name' => 'Lien entre %1$s et %2$s', 'Class:URP_UserOrg/Attribute:userid' => 'Utilisateur', 'Class:URP_UserOrg/Attribute:userid+' => '', 'Class:URP_UserOrg/Attribute:userlogin' => 'Login', @@ -900,8 +902,6 @@ Nous espérons que vous aimerez cette version autant que nous avons eu du plaisi 'UI:UserManagement:NoLifeCycleApplicable' => 'N/A', 'UI:UserManagement:NoLifeCycleApplicable+' => 'Aucun cycle de vie n\'est défini pour ce type d\'objets.', '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' => 'Administration', // 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...) diff --git a/dictionaries/hu.dictionary.itop.ui.php b/dictionaries/hu.dictionary.itop.ui.php index a6c4321ab..604be8c72 100755 --- a/dictionaries/hu.dictionary.itop.ui.php +++ b/dictionaries/hu.dictionary.itop.ui.php @@ -156,6 +156,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( Dict::Add('HU HU', 'Hungarian', 'Magyar', array( 'Class:URP_UserProfile' => 'Profilhoz rendelt felhasználók', 'Class:URP_UserProfile+' => '', + 'Class:URP_UserProfile/Name' => 'Kapcsolat %1$s és %2$s között', 'Class:URP_UserProfile/Attribute:userid' => 'Felhasználó', 'Class:URP_UserProfile/Attribute:userid+' => '', 'Class:URP_UserProfile/Attribute:userlogin' => 'Bejelentkezési név', @@ -176,6 +177,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( Dict::Add('HU HU', 'Hungarian', 'Magyar', array( 'Class:URP_UserOrg' => 'Felhasználó szervezeti egysége', 'Class:URP_UserOrg+' => '', + 'Class:URP_UserOrg/Name' => 'Kapcsolat %1$s és %2$s között', 'Class:URP_UserOrg/Attribute:userid' => 'Felhasználó', 'Class:URP_UserOrg/Attribute:userid+' => '', 'Class:URP_UserOrg/Attribute:userlogin' => 'Bejelentkezési név', @@ -893,8 +895,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( 'UI:UserManagement:NoLifeCycleApplicable' => 'N/A', 'UI:UserManagement:NoLifeCycleApplicable+' => '', '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', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools+' => '', // Duplicated into itop-welcome-itil (will be removed from here...) diff --git a/dictionaries/it.dictionary.itop.ui.php b/dictionaries/it.dictionary.itop.ui.php index c5a294761..112cf1896 100644 --- a/dictionaries/it.dictionary.itop.ui.php +++ b/dictionaries/it.dictionary.itop.ui.php @@ -167,6 +167,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( Dict::Add('IT IT', 'Italian', 'Italiano', array( 'Class:URP_UserProfile' => 'Utente da Profilare', 'Class:URP_UserProfile+' => '', + 'Class:URP_UserProfile/Name' => 'Collegamento tra %1$s e %2$s', 'Class:URP_UserProfile/Attribute:userid' => 'Utente', 'Class:URP_UserProfile/Attribute:userid+' => '', 'Class:URP_UserProfile/Attribute:userlogin' => 'Login', @@ -187,6 +188,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( Dict::Add('IT IT', 'Italian', 'Italiano', array( 'Class:URP_UserOrg' => 'Organizzazione dell\'utente', 'Class:URP_UserOrg+' => '', + 'Class:URP_UserOrg/Name' => 'Collegamento tra %1$s e %2$s', 'Class:URP_UserOrg/Attribute:userid' => 'Utente', 'Class:URP_UserOrg/Attribute:userid+' => 'Account Utente', 'Class:URP_UserOrg/Attribute:userlogin' => 'Login', @@ -904,8 +906,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( 'UI:UserManagement:NoLifeCycleApplicable' => 'N/A', 'UI:UserManagement:NoLifeCycleApplicable+' => '', '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', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools+' => '', // Duplicated into itop-welcome-itil (will be removed from here...) diff --git a/dictionaries/ja.dictionary.itop.ui.php b/dictionaries/ja.dictionary.itop.ui.php index 0cd94c471..0dc58c0e6 100644 --- a/dictionaries/ja.dictionary.itop.ui.php +++ b/dictionaries/ja.dictionary.itop.ui.php @@ -156,6 +156,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( Dict::Add('JA JP', 'Japanese', '日本語', array( 'Class:URP_UserProfile' => 'ユーザープロフィール', 'Class:URP_UserProfile+' => 'ユーザープロフィール', + 'Class:URP_UserProfile/Name' => '%1$s と %2$s間のリンク', 'Class:URP_UserProfile/Attribute:userid' => 'ユーザー', 'Class:URP_UserProfile/Attribute:userid+' => 'ユーザアカウント', 'Class:URP_UserProfile/Attribute:userlogin' => 'ログイン', @@ -176,6 +177,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( Dict::Add('JA JP', 'Japanese', '日本語', array( 'Class:URP_UserOrg' => 'ユーザー組織', 'Class:URP_UserOrg+' => '許可された組織', + 'Class:URP_UserOrg/Name' => '%1$s と %2$s 間のリンク', 'Class:URP_UserOrg/Attribute:userid' => 'ユーザー', 'Class:URP_UserOrg/Attribute:userid+' => 'ユーザーアカウント', 'Class:URP_UserOrg/Attribute:userlogin' => 'ログイン', @@ -893,8 +895,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( 'UI:UserManagement:NoLifeCycleApplicable' => '該当なし', 'UI:UserManagement:NoLifeCycleApplicable+' => 'このクラスにはライフサイクルは定義されていません。', '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' => '管理ツール', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools+' => '管理ツール', // Duplicated into itop-welcome-itil (will be removed from here...) diff --git a/dictionaries/nl.dictionary.itop.ui.php b/dictionaries/nl.dictionary.itop.ui.php index 52a36aff2..d186dd0bc 100644 --- a/dictionaries/nl.dictionary.itop.ui.php +++ b/dictionaries/nl.dictionary.itop.ui.php @@ -167,6 +167,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'Class:URP_UserProfile' => 'Gebruiker / Profiel', 'Class:URP_UserProfile+' => 'Koppeling tussen gebruikers en profielen', + 'Class:URP_UserProfile/Name' => 'Link tussen %1$s en %2$s', 'Class:URP_UserProfile/Attribute:userid' => 'Gebruiker', 'Class:URP_UserProfile/Attribute:userid+' => 'De gebruiker gekoppeld aan dit profiel', 'Class:URP_UserProfile/Attribute:userlogin' => 'Login', @@ -187,6 +188,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'Class:URP_UserOrg' => 'Gebruiker / Organisatie', 'Class:URP_UserOrg+' => 'Koppeling tussen gebruikers en organisaties', + 'Class:URP_UserOrg/Name' => 'Link tussen %1$s en %2$s', 'Class:URP_UserOrg/Attribute:userid' => 'Gebruiker', 'Class:URP_UserOrg/Attribute:userid+' => 'Account van de gebruiker', 'Class:URP_UserOrg/Attribute:userlogin' => 'Login', @@ -904,8 +906,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'UI:UserManagement:NoLifeCycleApplicable' => 'Niet beschikbaar', 'UI:UserManagement:NoLifeCycleApplicable+' => 'Er is geen levenscyclus gedefinieerd voor deze klasse', 'UI:UserManagement:GrantMatrix' => 'Rechtenmatrix', - 'UI:UserManagement:LinkBetween_User_And_Profile' => 'Link tussen %1$s en %2$s', - 'UI:UserManagement:LinkBetween_User_And_Org' => 'Link tussen %1$s en %2$s', 'Menu:AdminTools' => 'Admintools', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools+' => 'Beheertools', // Duplicated into itop-welcome-itil (will be removed from here...) diff --git a/dictionaries/pl.dictionary.itop.ui.php b/dictionaries/pl.dictionary.itop.ui.php index 773a80bbf..fb6ccfcf3 100644 --- a/dictionaries/pl.dictionary.itop.ui.php +++ b/dictionaries/pl.dictionary.itop.ui.php @@ -171,6 +171,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array( Dict::Add('PL PL', 'Polish', 'Polski', array( 'Class:URP_UserProfile' => 'Profil użytkownika', 'Class:URP_UserProfile+' => 'profile użytkowników', + 'Class:URP_UserProfile/Name' => 'Link między %1$s i %2$s', 'Class:URP_UserProfile/Attribute:userid' => 'Użytkownik', 'Class:URP_UserProfile/Attribute:userid+' => 'konto użytkownika', 'Class:URP_UserProfile/Attribute:userlogin' => 'Login', @@ -191,6 +192,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array( Dict::Add('PL PL', 'Polish', 'Polski', array( 'Class:URP_UserOrg' => 'Organizacje użytkowników', 'Class:URP_UserOrg+' => 'Dozwolone organizacje', + 'Class:URP_UserOrg/Name' => 'Link między %1$s i %2$s', 'Class:URP_UserOrg/Attribute:userid' => 'Użytkownik', 'Class:URP_UserOrg/Attribute:userid+' => 'konto użytkownika', 'Class:URP_UserOrg/Attribute:userlogin' => 'Login', @@ -905,8 +907,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array( 'UI:UserManagement:NoLifeCycleApplicable' => 'Nie dotyczy', 'UI:UserManagement:NoLifeCycleApplicable+' => 'Dla tej klasy nie zdefiniowano żadnego cyklu życia', 'UI:UserManagement:GrantMatrix' => 'Matryca uprawnień', - 'UI:UserManagement:LinkBetween_User_And_Profile' => 'Link między %1$s i %2$s', - 'UI:UserManagement:LinkBetween_User_And_Org' => 'Link między %1$s i %2$s', 'Menu:AdminTools' => 'Administracja', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools+' => 'Narzędzia administracyjne', // Duplicated into itop-welcome-itil (will be removed from here...) diff --git a/dictionaries/pt_br.dictionary.itop.ui.php b/dictionaries/pt_br.dictionary.itop.ui.php index c6a6b6296..a4c0110c0 100644 --- a/dictionaries/pt_br.dictionary.itop.ui.php +++ b/dictionaries/pt_br.dictionary.itop.ui.php @@ -167,6 +167,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'Class:URP_UserProfile' => 'Usuário para perfil', 'Class:URP_UserProfile+' => 'Perfil usuário', + 'Class:URP_UserProfile/Name' => 'Link entre %1$s e %2$s', 'Class:URP_UserProfile/Attribute:userid' => 'Usuário', 'Class:URP_UserProfile/Attribute:userid+' => 'Conta usuário', 'Class:URP_UserProfile/Attribute:userlogin' => 'Login', @@ -187,6 +188,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'Class:URP_UserOrg' => 'Organização usuário', 'Class:URP_UserOrg+' => 'Organizações permitidas', + 'Class:URP_UserOrg/Name' => 'Link entre %1$s e %2$s', 'Class:URP_UserOrg/Attribute:userid' => 'Usário', 'Class:URP_UserOrg/Attribute:userid+' => 'Conta usuário', 'Class:URP_UserOrg/Attribute:userlogin' => 'Login', @@ -904,8 +906,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'UI:UserManagement:NoLifeCycleApplicable' => 'N/A', 'UI:UserManagement:NoLifeCycleApplicable+' => 'Ciclo de vida não tem sido definida para esta classe', 'UI:UserManagement:GrantMatrix' => 'Permissões concedidas', - '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', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools+' => 'Ferramentas Administrativas', // Duplicated into itop-welcome-itil (will be removed from here...) diff --git a/dictionaries/ru.dictionary.itop.ui.php b/dictionaries/ru.dictionary.itop.ui.php index a6ba528a0..d1e57431a 100644 --- a/dictionaries/ru.dictionary.itop.ui.php +++ b/dictionaries/ru.dictionary.itop.ui.php @@ -168,6 +168,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( Dict::Add('RU RU', 'Russian', 'Русский', array( 'Class:URP_UserProfile' => 'Профиль пользователя', 'Class:URP_UserProfile+' => 'Профиль пользователя', + 'Class:URP_UserProfile/Name' => 'Связь между %1$s и %2$s', 'Class:URP_UserProfile/Attribute:userid' => 'Пользователь', 'Class:URP_UserProfile/Attribute:userid+' => 'учетная запись пользователя', 'Class:URP_UserProfile/Attribute:userlogin' => 'Логин', @@ -188,6 +189,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( Dict::Add('RU RU', 'Russian', 'Русский', array( 'Class:URP_UserOrg' => 'Организации пользователя', 'Class:URP_UserOrg+' => 'Разрешённые организации', + 'Class:URP_UserOrg/Name' => 'Связь между %1$s и %2$s', 'Class:URP_UserOrg/Attribute:userid' => 'Пользователь', 'Class:URP_UserOrg/Attribute:userid+' => 'Учетная запись пользователя', 'Class:URP_UserOrg/Attribute:userlogin' => 'Логин', @@ -905,8 +907,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'UI:UserManagement:NoLifeCycleApplicable' => 'не определено', 'UI:UserManagement:NoLifeCycleApplicable+' => 'Не определён жизненній цикл для данного класса', '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' => 'Инструменты администратора', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools+' => 'Инструменты администратора', // Duplicated into itop-welcome-itil (will be removed from here...) diff --git a/dictionaries/sk.dictionary.itop.ui.php b/dictionaries/sk.dictionary.itop.ui.php index e5e3e273e..5fae9d0df 100644 --- a/dictionaries/sk.dictionary.itop.ui.php +++ b/dictionaries/sk.dictionary.itop.ui.php @@ -155,6 +155,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array( Dict::Add('SK SK', 'Slovak', 'Slovenčina', array( 'Class:URP_UserProfile' => 'Z užívateľa na profil', 'Class:URP_UserProfile+' => '', + 'Class:URP_UserProfile/Name' => 'Spojenie medzi %1$s a %2$s', 'Class:URP_UserProfile/Attribute:userid' => 'Užívateľ', 'Class:URP_UserProfile/Attribute:userid+' => '', 'Class:URP_UserProfile/Attribute:userlogin' => 'Prihlasovacie meno', @@ -175,6 +176,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array( Dict::Add('SK SK', 'Slovak', 'Slovenčina', array( 'Class:URP_UserOrg' => 'Užívateľské organizácie', 'Class:URP_UserOrg+' => '', + 'Class:URP_UserOrg/Name' => 'Spojenie medzi %1$s a %2$s', 'Class:URP_UserOrg/Attribute:userid' => 'Užívateľ', 'Class:URP_UserOrg/Attribute:userid+' => '', 'Class:URP_UserOrg/Attribute:userlogin' => 'Prihlasovacie meno', @@ -893,8 +895,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array( 'UI:UserManagement:NoLifeCycleApplicable' => 'N/A', 'UI:UserManagement:NoLifeCycleApplicable+' => '', 'UI:UserManagement:GrantMatrix' => 'Udelovacia matica', - 'UI:UserManagement:LinkBetween_User_And_Profile' => 'Spojenie medzi %1$s a %2$s', - 'UI:UserManagement:LinkBetween_User_And_Org' => 'Spojenie medzi %1$s a %2$s', 'Menu:AdminTools' => 'Administrátorské pomôcky', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools+' => '', // Duplicated into itop-welcome-itil (will be removed from here...) diff --git a/dictionaries/tr.dictionary.itop.ui.php b/dictionaries/tr.dictionary.itop.ui.php index 537faf038..ec6c01ef7 100644 --- a/dictionaries/tr.dictionary.itop.ui.php +++ b/dictionaries/tr.dictionary.itop.ui.php @@ -167,6 +167,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array( Dict::Add('TR TR', 'Turkish', 'Türkçe', array( 'Class:URP_UserProfile' => 'Kullanıcı Profili', 'Class:URP_UserProfile+' => 'Kullanıcı Profili', + 'Class:URP_UserProfile/Name' => '%1$s ve %2$s arasındaki ilişki', 'Class:URP_UserProfile/Attribute:userid' => 'Kullanıcı', 'Class:URP_UserProfile/Attribute:userid+' => 'Kullanıcı hesabı', 'Class:URP_UserProfile/Attribute:userlogin' => 'Kullanıcı adı', @@ -187,6 +188,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array( Dict::Add('TR TR', 'Turkish', 'Türkçe', array( 'Class:URP_UserOrg' => 'Kullanıcı Kurumu', 'Class:URP_UserOrg+' => 'İzin verilen kurumlar', + 'Class:URP_UserOrg/Name' => '%1$s ve %2$s arasındaki ilişki', 'Class:URP_UserOrg/Attribute:userid' => 'Kullanıcı', 'Class:URP_UserOrg/Attribute:userid+' => 'Kullanıcı hesabı', 'Class:URP_UserOrg/Attribute:userlogin' => 'Kullanıcı', @@ -904,8 +906,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array( 'UI:UserManagement:NoLifeCycleApplicable' => 'N/A', 'UI:UserManagement:NoLifeCycleApplicable+' => 'Bu nesne için yaşam döngüsü tanımsız', 'UI:UserManagement:GrantMatrix' => 'Yetkiler', - '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ı', // 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...) diff --git a/dictionaries/zh_cn.dictionary.itop.ui.php b/dictionaries/zh_cn.dictionary.itop.ui.php index c8872d92f..54aadb610 100644 --- a/dictionaries/zh_cn.dictionary.itop.ui.php +++ b/dictionaries/zh_cn.dictionary.itop.ui.php @@ -166,6 +166,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:URP_UserProfile' => '角色目标用户', 'Class:URP_UserProfile+' => '用户的角色', + 'Class:URP_UserProfile/Name' => '链接 %1$s 和 %2$s', 'Class:URP_UserProfile/Attribute:userid' => '用户', 'Class:URP_UserProfile/Attribute:userid+' => '用户帐户', 'Class:URP_UserProfile/Attribute:userlogin' => '登录名', @@ -186,6 +187,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:URP_UserOrg' => '用户组织', 'Class:URP_UserOrg+' => '可以访问的组织', + 'Class:URP_UserOrg/Name' => '链接 %1$s 和 %2$s', 'Class:URP_UserOrg/Attribute:userid' => '用户', 'Class:URP_UserOrg/Attribute:userid+' => '用户帐户', 'Class:URP_UserOrg/Attribute:userlogin' => '登录名', @@ -903,8 +905,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'UI:UserManagement:NoLifeCycleApplicable' => 'N/A', 'UI:UserManagement:NoLifeCycleApplicable+' => '该类未定义生命周期', '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' => '管理工具', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools+' => '管理工具', // Duplicated into itop-welcome-itil (will be removed from here...)