diff --git a/datamodels/2.x/authent-local/dictionaries/cs.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/cs.dict.authent-local.php
index 7af2aec0e..24896910b 100644
--- a/datamodels/2.x/authent-local/dictionaries/cs.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/cs.dict.authent-local.php
@@ -50,7 +50,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~',
'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
- 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~',
+ 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewed on~~',
'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
'UserLocal:password:expiration' => 'The fields below require an extension~~',
diff --git a/datamodels/2.x/authent-local/dictionaries/da.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/da.dict.authent-local.php
index 10ae55765..eb88a7b67 100644
--- a/datamodels/2.x/authent-local/dictionaries/da.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/da.dict.authent-local.php
@@ -35,7 +35,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~',
'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
- 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~',
+ 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewed on~~',
'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
'UserLocal:password:expiration' => 'The fields below require an extension~~',
diff --git a/datamodels/2.x/authent-local/dictionaries/it.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/it.dict.authent-local.php
index a410f23df..03af031ce 100644
--- a/datamodels/2.x/authent-local/dictionaries/it.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/it.dict.authent-local.php
@@ -48,7 +48,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~',
'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
- 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~',
+ 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewed on~~',
'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
'UserLocal:password:expiration' => 'The fields below require an extension~~',
diff --git a/datamodels/2.x/authent-local/dictionaries/ja.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/ja.dict.authent-local.php
index 1b1866a7d..036db9856 100644
--- a/datamodels/2.x/authent-local/dictionaries/ja.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/ja.dict.authent-local.php
@@ -35,7 +35,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~',
'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
- 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~',
+ 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewed on~~',
'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
'UserLocal:password:expiration' => 'The fields below require an extension~~',
diff --git a/datamodels/2.x/authent-local/dictionaries/sk.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/sk.dict.authent-local.php
index 1c12548ba..6b12ddd6e 100644
--- a/datamodels/2.x/authent-local/dictionaries/sk.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/sk.dict.authent-local.php
@@ -47,7 +47,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~',
'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
- 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~',
+ 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewed on~~',
'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
'UserLocal:password:expiration' => 'The fields below require an extension~~',
diff --git a/datamodels/2.x/authent-local/dictionaries/tr.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/tr.dict.authent-local.php
index b0092e68d..4a436a9a4 100644
--- a/datamodels/2.x/authent-local/dictionaries/tr.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/tr.dict.authent-local.php
@@ -49,7 +49,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~',
'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
- 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~',
+ 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewed on~~',
'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
'UserLocal:password:expiration' => 'The fields below require an extension~~',
diff --git a/datamodels/2.x/combodo-db-tools/dictionaries/cs.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/cs.dict.combodo-db-tools.php
index e75e65b89..d14b175d4 100644
--- a/datamodels/2.x/combodo-db-tools/dictionaries/cs.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/cs.dict.combodo-db-tools.php
@@ -23,9 +23,9 @@
// Database inconsistencies
Dict::Add('CS CZ', 'Czech', 'Čeština', array(
// Dictionary entries go here
- 'Menu:DBToolsMenu' => 'DB Tools~~',
+ 'Menu:DBToolsMenu' => 'Database integrity~~',
'DBTools:Class' => 'Class~~',
- 'DBTools:Title' => 'Database Maintenance Tools~~',
+ 'DBTools:Title' => 'Database integrity check~~',
'DBTools:ErrorsFound' => 'Errors Found~~',
'DBTools:Indication' => 'Important: after fixing errors in the database you\'ll have to run the analysis again as new inconsistencies will be generated~~',
'DBTools:Disclaimer' => 'DISCLAIMER: BACKUP YOUR DATABASE BEFORE RUNNING THE FIXES~~',
diff --git a/datamodels/2.x/combodo-db-tools/dictionaries/da.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/da.dict.combodo-db-tools.php
index 931812344..0cebdc93e 100644
--- a/datamodels/2.x/combodo-db-tools/dictionaries/da.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/da.dict.combodo-db-tools.php
@@ -23,9 +23,9 @@
// Database inconsistencies
Dict::Add('DA DA', 'Danish', 'Dansk', array(
// Dictionary entries go here
- 'Menu:DBToolsMenu' => 'DB Tools~~',
+ 'Menu:DBToolsMenu' => 'Database integrity~~',
'DBTools:Class' => 'Class~~',
- 'DBTools:Title' => 'Database Maintenance Tools~~',
+ 'DBTools:Title' => 'Database integrity check~~',
'DBTools:ErrorsFound' => 'Errors Found~~',
'DBTools:Indication' => 'Important: after fixing errors in the database you\'ll have to run the analysis again as new inconsistencies will be generated~~',
'DBTools:Disclaimer' => 'DISCLAIMER: BACKUP YOUR DATABASE BEFORE RUNNING THE FIXES~~',
diff --git a/datamodels/2.x/combodo-db-tools/dictionaries/hu.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/hu.dict.combodo-db-tools.php
index 2bc024795..0b38b6ea4 100644
--- a/datamodels/2.x/combodo-db-tools/dictionaries/hu.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/hu.dict.combodo-db-tools.php
@@ -50,7 +50,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'DBAnalyzer-Integrity-OrphanRecord' => 'Árva rekord a `%1$s` -ban, kell hogy legyen megfelelője a `%2$s` táblázatban',
'DBAnalyzer-Integrity-InvalidExtKey' => 'Érvénytelen a %1$s külső kulcs (oszlop: `%2$s.%3$s`)',
'DBAnalyzer-Integrity-MissingExtKey' => 'Hiányzik a %1$s külső külcs (oszlop: `%2$s.%3$s`)',
- 'DBAnalyzer-Integrity-InvalidValue' => '%1$s értéke érvénytelen (oszlop: `%2$s.%3$s`)~~',
+ 'DBAnalyzer-Integrity-InvalidValue' => '%1$s értéke érvénytelen (oszlop: `%2$s.%3$s`)',
'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Néhány felhasználónak egyáltalán nincs fiókja',
'DBAnalyzer-Integrity-HKInvalid' => 'Sérült a `%1$s` hierarchikus kulcs',
'DBAnalyzer-Fetch-Count-Error' => 'Lekérési hiba a `%1$s` -nál, %2$d bejegyzés lekérve / %3$d megszámlálva',
diff --git a/datamodels/2.x/combodo-db-tools/dictionaries/it.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/it.dict.combodo-db-tools.php
index ad2db0f86..a3d35986f 100644
--- a/datamodels/2.x/combodo-db-tools/dictionaries/it.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/it.dict.combodo-db-tools.php
@@ -23,9 +23,9 @@
// Database inconsistencies
Dict::Add('IT IT', 'Italian', 'Italiano', array(
// Dictionary entries go here
- 'Menu:DBToolsMenu' => 'DB Tools~~',
+ 'Menu:DBToolsMenu' => 'Database integrity~~',
'DBTools:Class' => 'Class~~',
- 'DBTools:Title' => 'Database Maintenance Tools~~',
+ 'DBTools:Title' => 'Database integrity check~~',
'DBTools:ErrorsFound' => 'Errors Found~~',
'DBTools:Indication' => 'Important: after fixing errors in the database you\'ll have to run the analysis again as new inconsistencies will be generated~~',
'DBTools:Disclaimer' => 'DISCLAIMER: BACKUP YOUR DATABASE BEFORE RUNNING THE FIXES~~',
diff --git a/datamodels/2.x/combodo-db-tools/dictionaries/ja.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/ja.dict.combodo-db-tools.php
index 5a98dc3b2..4987337ab 100644
--- a/datamodels/2.x/combodo-db-tools/dictionaries/ja.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/ja.dict.combodo-db-tools.php
@@ -23,9 +23,9 @@
// Database inconsistencies
Dict::Add('JA JP', 'Japanese', '日本語', array(
// Dictionary entries go here
- 'Menu:DBToolsMenu' => 'DB Tools~~',
+ 'Menu:DBToolsMenu' => 'Database integrity~~',
'DBTools:Class' => 'Class~~',
- 'DBTools:Title' => 'Database Maintenance Tools~~',
+ 'DBTools:Title' => 'Database integrity check~~',
'DBTools:ErrorsFound' => 'Errors Found~~',
'DBTools:Indication' => 'Important: after fixing errors in the database you\'ll have to run the analysis again as new inconsistencies will be generated~~',
'DBTools:Disclaimer' => 'DISCLAIMER: BACKUP YOUR DATABASE BEFORE RUNNING THE FIXES~~',
diff --git a/datamodels/2.x/combodo-db-tools/dictionaries/ru.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/ru.dict.combodo-db-tools.php
index ec81407a0..520582335 100644
--- a/datamodels/2.x/combodo-db-tools/dictionaries/ru.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/ru.dict.combodo-db-tools.php
@@ -12,7 +12,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
// Dictionary entries go here
'Menu:DBToolsMenu' => 'Инструменты БД',
'DBTools:Class' => 'Класс',
- 'DBTools:Title' => 'Инструменты обслуживания базы данных~~',
+ 'DBTools:Title' => 'Инструменты обслуживания базы данных',
'DBTools:ErrorsFound' => 'Найденные ошибки',
'DBTools:Indication' => 'Important: after fixing errors in the database you\'ll have to run the analysis again as new inconsistencies will be generated~~',
'DBTools:Disclaimer' => 'DISCLAIMER: BACKUP YOUR DATABASE BEFORE RUNNING THE FIXES~~',
diff --git a/datamodels/2.x/combodo-db-tools/dictionaries/sk.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/sk.dict.combodo-db-tools.php
index 43b77c257..279fb190a 100644
--- a/datamodels/2.x/combodo-db-tools/dictionaries/sk.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/sk.dict.combodo-db-tools.php
@@ -25,7 +25,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
// Dictionary entries go here
'Menu:DBToolsMenu' => 'Database integrity~~',
'DBTools:Class' => 'Class~~',
- 'DBTools:Title' => 'Database Maintenance Tools~~',
+ 'DBTools:Title' => 'Database integrity check~~',
'DBTools:ErrorsFound' => 'Errors Found~~',
'DBTools:Indication' => 'Important: after fixing errors in the database you\'ll have to run the analysis again as new inconsistencies will be generated~~',
'DBTools:Disclaimer' => 'DISCLAIMER: BACKUP YOUR DATABASE BEFORE RUNNING THE FIXES~~',
diff --git a/datamodels/2.x/combodo-db-tools/dictionaries/tr.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/tr.dict.combodo-db-tools.php
index f6c90679e..48657ccdd 100644
--- a/datamodels/2.x/combodo-db-tools/dictionaries/tr.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/tr.dict.combodo-db-tools.php
@@ -23,9 +23,9 @@
// Database inconsistencies
Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
// Dictionary entries go here
- 'Menu:DBToolsMenu' => 'DB Tools~~',
+ 'Menu:DBToolsMenu' => 'Database integrity~~',
'DBTools:Class' => 'Class~~',
- 'DBTools:Title' => 'Database Maintenance Tools~~',
+ 'DBTools:Title' => 'Database integrity check~~',
'DBTools:ErrorsFound' => 'Errors Found~~',
'DBTools:Indication' => 'Important: after fixing errors in the database you\'ll have to run the analysis again as new inconsistencies will be generated~~',
'DBTools:Disclaimer' => 'DISCLAIMER: BACKUP YOUR DATABASE BEFORE RUNNING THE FIXES~~',
diff --git a/datamodels/2.x/itop-attachments/dictionaries/it.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/it.dict.itop-attachments.php
index 24acff152..adcf527e2 100644
--- a/datamodels/2.x/itop-attachments/dictionaries/it.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/it.dict.itop-attachments.php
@@ -29,9 +29,9 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Attachments:History_File_Removed' => 'Attachment %1$s removed.~~',
'Attachments:AddAttachment' => 'Add attachment: ~~',
'Attachments:UploadNotAllowedOnThisSystem' => 'File upload in NOT allowed on this system.~~',
- 'Attachment:Max_Go' => '(Maximum file size: %1$s Go)~~',
- 'Attachment:Max_Mo' => '(Maximum file size: %1$s Mo)~~',
- 'Attachment:Max_Ko' => '(Maximum file size: %1$s Ko)~~',
+ 'Attachment:Max_Go' => '(Maximum file size: %1$s GB)~~',
+ 'Attachment:Max_Mo' => '(Maximum file size: %1$s MB)~~',
+ 'Attachment:Max_Ko' => '(Maximum file size: %1$s KB)~~',
'Attachments:NoAttachment' => 'No attachment. ~~',
'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s~~',
diff --git a/datamodels/2.x/itop-attachments/dictionaries/tr.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/tr.dict.itop-attachments.php
index 57239db0c..a133bf00c 100644
--- a/datamodels/2.x/itop-attachments/dictionaries/tr.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/tr.dict.itop-attachments.php
@@ -29,9 +29,9 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Attachments:History_File_Removed' => 'Attachment %1$s removed.~~',
'Attachments:AddAttachment' => 'Add attachment: ~~',
'Attachments:UploadNotAllowedOnThisSystem' => 'File upload in NOT allowed on this system.~~',
- 'Attachment:Max_Go' => '(Maximum file size: %1$s Go)~~',
- 'Attachment:Max_Mo' => '(Maximum file size: %1$s Mo)~~',
- 'Attachment:Max_Ko' => '(Maximum file size: %1$s Ko)~~',
+ 'Attachment:Max_Go' => '(Maximum file size: %1$s GB)~~',
+ 'Attachment:Max_Mo' => '(Maximum file size: %1$s MB)~~',
+ 'Attachment:Max_Ko' => '(Maximum file size: %1$s KB)~~',
'Attachments:NoAttachment' => 'No attachment. ~~',
'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s~~',
diff --git a/datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php
index b10f00d1e..0a1fc9b4a 100644
--- a/datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php
@@ -23,8 +23,8 @@
Dict::Add('DA DA', 'Danish', 'Dansk', array(
'bkp-backup-running' => 'A backup is running. Please wait...~~',
'bkp-restore-running' => 'A restore is running. Please wait...~~',
- 'Menu:BackupStatus' => 'Scheduled Backups~~',
- 'bkp-status-title' => 'Scheduled Backups~~',
+ 'Menu:BackupStatus' => 'Backups~~',
+ 'bkp-status-title' => 'Backups~~',
'bkp-status-checks' => 'Settings and checks~~',
'bkp-mysqldump-ok' => 'mysqldump is present: %1$s~~',
'bkp-mysqldump-notfound' => 'mysqldump could not be found: %1$s - Please make sure it is installed and in the path, or edit the configuration file to tune mysql_bindir.~~',
@@ -46,7 +46,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'bkp-status-backups-auto' => 'Scheduled backups~~',
'bkp-status-backups-manual' => 'Manual backups~~',
'bkp-status-backups-none' => 'No backup yet~~',
- 'bkp-next-backup' => 'The next backup will occur on %1$s (%2$s) at %3$s~~',
+ 'bkp-next-backup' => 'The next backup will occur on %1$s (%2$s) at %3$s.~~',
'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~',
'bkp-button-backup-now' => 'Backup now!~~',
'bkp-button-restore-now' => 'Restore!~~',
diff --git a/datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php
index 4d8b3c3ce..6d3a6c4fa 100644
--- a/datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php
@@ -23,8 +23,8 @@
Dict::Add('IT IT', 'Italian', 'Italiano', array(
'bkp-backup-running' => 'A backup is running. Please wait...~~',
'bkp-restore-running' => 'A restore is running. Please wait...~~',
- 'Menu:BackupStatus' => 'Scheduled backups~~',
- 'bkp-status-title' => 'Scheduled Backups~~',
+ 'Menu:BackupStatus' => 'Backups~~',
+ 'bkp-status-title' => 'Backups~~',
'bkp-status-checks' => 'Settings and checks~~',
'bkp-mysqldump-ok' => 'mysqldump is present: %1$s~~',
'bkp-mysqldump-notfound' => 'mysqldump could not be found: %1$s - Please make sure it is installed and in the path, or edit the configuration file to tune mysql_bindir.~~',
@@ -46,7 +46,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'bkp-status-backups-auto' => 'Scheduled backups~~',
'bkp-status-backups-manual' => 'Manual backups~~',
'bkp-status-backups-none' => 'No backup yet~~',
- 'bkp-next-backup' => 'The next backup will occur on %1$s (%2$s) at %3$s~~',
+ 'bkp-next-backup' => 'The next backup will occur on %1$s (%2$s) at %3$s.~~',
'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~',
'bkp-button-backup-now' => 'Backup now!~~',
'bkp-button-restore-now' => 'Restore!~~',
diff --git a/datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php
index 9358937b1..701eb517b 100644
--- a/datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php
@@ -23,8 +23,8 @@
Dict::Add('JA JP', 'Japanese', '日本語', array(
'bkp-backup-running' => 'A backup is running. Please wait...~~',
'bkp-restore-running' => 'A restore is running. Please wait...~~',
- 'Menu:BackupStatus' => 'Scheduled backups~~',
- 'bkp-status-title' => 'Scheduled Backups~~',
+ 'Menu:BackupStatus' => 'Backups~~',
+ 'bkp-status-title' => 'Backups~~',
'bkp-status-checks' => 'Settings and checks~~',
'bkp-mysqldump-ok' => 'mysqldump is present: %1$s~~',
'bkp-mysqldump-notfound' => 'mysqldump could not be found: %1$s - Please make sure it is installed and in the path, or edit the configuration file to tune mysql_bindir.~~',
@@ -46,7 +46,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'bkp-status-backups-auto' => 'Scheduled backups~~',
'bkp-status-backups-manual' => 'Manual backups~~',
'bkp-status-backups-none' => 'No backup yet~~',
- 'bkp-next-backup' => 'The next backup will occur on %1$s (%2$s) at %3$s~~',
+ 'bkp-next-backup' => 'The next backup will occur on %1$s (%2$s) at %3$s.~~',
'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~',
'bkp-button-backup-now' => 'Backup now!~~',
'bkp-button-restore-now' => 'Restore!~~',
diff --git a/datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php
index 813d9282e..21dede01c 100644
--- a/datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php
@@ -23,8 +23,8 @@
Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'bkp-backup-running' => 'A backup is running. Please wait...~~',
'bkp-restore-running' => 'A restore is running. Please wait...~~',
- 'Menu:BackupStatus' => 'Scheduled Backups~~',
- 'bkp-status-title' => 'Scheduled Backups~~',
+ 'Menu:BackupStatus' => 'Backups~~',
+ 'bkp-status-title' => 'Backups~~',
'bkp-status-checks' => 'Settings and checks~~',
'bkp-mysqldump-ok' => 'mysqldump is present: %1$s~~',
'bkp-mysqldump-notfound' => 'mysqldump could not be found: %1$s - Please make sure it is installed and in the path, or edit the configuration file to tune mysql_bindir.~~',
@@ -46,7 +46,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'bkp-status-backups-auto' => 'Scheduled backups~~',
'bkp-status-backups-manual' => 'Manual backups~~',
'bkp-status-backups-none' => 'No backup yet~~',
- 'bkp-next-backup' => 'The next backup will occur on %1$s (%2$s) at %3$s~~',
+ 'bkp-next-backup' => 'The next backup will occur on %1$s (%2$s) at %3$s.~~',
'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~',
'bkp-button-backup-now' => 'Backup now!~~',
'bkp-button-restore-now' => 'Restore!~~',
diff --git a/datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php
index 3c2298e84..e2a84758b 100644
--- a/datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php
@@ -23,8 +23,8 @@
Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'bkp-backup-running' => 'A backup is running. Please wait...~~',
'bkp-restore-running' => 'A restore is running. Please wait...~~',
- 'Menu:BackupStatus' => 'Scheduled Backups~~',
- 'bkp-status-title' => 'Scheduled Backups~~',
+ 'Menu:BackupStatus' => 'Backups~~',
+ 'bkp-status-title' => 'Backups~~',
'bkp-status-checks' => 'Settings and checks~~',
'bkp-mysqldump-ok' => 'mysqldump is present: %1$s~~',
'bkp-mysqldump-notfound' => 'mysqldump could not be found: %1$s - Please make sure it is installed and in the path, or edit the configuration file to tune mysql_bindir.~~',
@@ -46,7 +46,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'bkp-status-backups-auto' => 'Scheduled backups~~',
'bkp-status-backups-manual' => 'Manual backups~~',
'bkp-status-backups-none' => 'No backup yet~~',
- 'bkp-next-backup' => 'The next backup will occur on %1$s (%2$s) at %3$s~~',
+ 'bkp-next-backup' => 'The next backup will occur on %1$s (%2$s) at %3$s.~~',
'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~',
'bkp-button-backup-now' => 'Backup now!~~',
'bkp-button-restore-now' => 'Restore!~~',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php
index 2eae107c3..333247ef3 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php
@@ -1282,7 +1282,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:VLAN/Attribute:org_id' => 'Organization~~',
'Class:VLAN/Attribute:org_id+' => '~~',
'Class:VLAN/Attribute:org_name' => 'Organization name~~',
- 'Class:VLAN/Attribute:org_name+' => 'Common name~~',
+ 'Class:VLAN/Attribute:org_name+' => '',
'Class:VLAN/Attribute:subnets_list' => 'Subnets~~',
'Class:VLAN/Attribute:subnets_list+' => '~~',
'Class:VLAN/Attribute:physicalinterfaces_list' => 'Physical network interfaces~~',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php
index f2573e38a..7fe022b33 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php
@@ -34,7 +34,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'Relation:depends on/UpStream' => 'Wirkt auf ...',
'Relation:impacts/LoadData' => 'Daten laden',
'Relation:impacts/FilteredData' => 'Daten sind über den Tab "Grafische Ansicht" gefiltert',
- 'Relation:impacts/NoFilteredData' => 'Bitte wählen Sie Objekte ~~',
+ 'Relation:impacts/NoFilteredData' => 'Bitte wählen Sie Objekte',
));
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
index 1418bc963..1d2f5273b 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
@@ -1438,7 +1438,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink' => 'Bejövő',
'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink+' => 'bejövő link',
'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink' => 'Kimenő',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink+' => 'kimenő link~~',
+ 'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink+' => 'kimenő link',
));
//
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
index 839137c45..087bbd259 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
@@ -105,7 +105,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:FunctionalCI/Attribute:org_id+' => '',
'Class:FunctionalCI/Attribute:organization_name' => 'Organization name~~',
'Class:FunctionalCI/Attribute:organization_name+' => 'Common name~~',
- 'Class:FunctionalCI/Attribute:business_criticity' => 'Business criticity~~',
+ 'Class:FunctionalCI/Attribute:business_criticity' => 'Business criticality~~',
'Class:FunctionalCI/Attribute:business_criticity+' => '~~',
'Class:FunctionalCI/Attribute:business_criticity/Value:high' => 'high~~',
'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'high~~',
@@ -268,7 +268,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:DatacenterDevice/Attribute:enclosure_name+' => '~~',
'Class:DatacenterDevice/Attribute:nb_u' => 'Rack units~~',
'Class:DatacenterDevice/Attribute:nb_u+' => '~~',
- 'Class:DatacenterDevice/Attribute:managementip' => 'Management ip~~',
+ 'Class:DatacenterDevice/Attribute:managementip' => 'Management IP~~',
'Class:DatacenterDevice/Attribute:managementip+' => '~~',
'Class:DatacenterDevice/Attribute:powerA_id' => 'PowerA source~~',
'Class:DatacenterDevice/Attribute:powerA_id+' => '~~',
@@ -327,9 +327,9 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:Server/Attribute:osversion_id+' => '~~',
'Class:Server/Attribute:osversion_name' => 'OS version name~~',
'Class:Server/Attribute:osversion_name+' => '~~',
- 'Class:Server/Attribute:oslicence_id' => 'OS licence~~',
+ 'Class:Server/Attribute:oslicence_id' => 'OS license~~',
'Class:Server/Attribute:oslicence_id+' => '~~',
- 'Class:Server/Attribute:oslicence_name' => 'OS licence name~~',
+ 'Class:Server/Attribute:oslicence_name' => 'OS license name~~',
'Class:Server/Attribute:oslicence_name+' => '~~',
'Class:Server/Attribute:cpu' => 'CPU',
'Class:Server/Attribute:cpu+' => '',
@@ -548,9 +548,9 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:SoftwareInstance/Attribute:software_id+' => '~~',
'Class:SoftwareInstance/Attribute:software_name' => 'Software',
'Class:SoftwareInstance/Attribute:software_name+' => '',
- 'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Software licence~~',
+ 'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Software license~~',
'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '~~',
- 'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Software licence name~~',
+ 'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Software license name~~',
'Class:SoftwareInstance/Attribute:softwarelicence_name+' => '~~',
'Class:SoftwareInstance/Attribute:path' => 'Path~~',
'Class:SoftwareInstance/Attribute:path+' => '~~',
@@ -742,9 +742,9 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:VirtualMachine/Attribute:osversion_id+' => '~~',
'Class:VirtualMachine/Attribute:osversion_name' => 'OS version name~~',
'Class:VirtualMachine/Attribute:osversion_name+' => '~~',
- 'Class:VirtualMachine/Attribute:oslicence_id' => 'OS licence~~',
+ 'Class:VirtualMachine/Attribute:oslicence_id' => 'OS license~~',
'Class:VirtualMachine/Attribute:oslicence_id+' => '~~',
- 'Class:VirtualMachine/Attribute:oslicence_name' => 'OS licence name~~',
+ 'Class:VirtualMachine/Attribute:oslicence_name' => 'OS license name~~',
'Class:VirtualMachine/Attribute:oslicence_name+' => '~~',
'Class:VirtualMachine/Attribute:cpu' => 'CPU~~',
'Class:VirtualMachine/Attribute:cpu+' => '~~',
@@ -895,7 +895,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:Software/ComplementaryName' => '%1$s - %2$s~~',
'Class:Software/Attribute:name' => 'Nome',
'Class:Software/Attribute:name+' => '',
- 'Class:Software/Attribute:vendor' => 'vendor~~',
+ 'Class:Software/Attribute:vendor' => 'Vendor~~',
'Class:Software/Attribute:vendor+' => '~~',
'Class:Software/Attribute:version' => 'Version~~',
'Class:Software/Attribute:version+' => '~~',
@@ -917,8 +917,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:Software/Attribute:softwareinstance_list+' => 'All the software instances for this software~~',
'Class:Software/Attribute:softwarepatch_list' => 'Software Patches~~',
'Class:Software/Attribute:softwarepatch_list+' => 'All the patchs for this software~~',
- 'Class:Software/Attribute:softwarelicence_list' => 'Software Licences~~',
- 'Class:Software/Attribute:softwarelicence_list+' => 'All the licences for this software~~',
+ 'Class:Software/Attribute:softwarelicence_list' => 'Software Licenses~~',
+ 'Class:Software/Attribute:softwarelicence_list+' => 'All the licenses for this software~~',
));
//
@@ -934,7 +934,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:Patch/Attribute:documents_list+' => 'All the documents linked to this patch~~',
'Class:Patch/Attribute:description' => 'Descrizione',
'Class:Patch/Attribute:description+' => '',
- 'Class:Patch/Attribute:finalclass' => 'Type~~',
+ 'Class:Patch/Attribute:finalclass' => 'Patch sub-class~~',
'Class:Patch/Attribute:finalclass+' => 'Name of the final class~~',
));
@@ -978,7 +978,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:Licence/Attribute:name' => 'Nome',
'Class:Licence/Attribute:name+' => '',
'Class:Licence/Attribute:documents_list' => 'Documents~~',
- 'Class:Licence/Attribute:documents_list+' => 'All the documents linked to this licence~~',
+ 'Class:Licence/Attribute:documents_list+' => 'All the documents linked to this license~~',
'Class:Licence/Attribute:org_id' => 'Proprietario',
'Class:Licence/Attribute:org_id+' => '',
'Class:Licence/Attribute:organization_name' => 'Organization name~~',
@@ -999,7 +999,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:Licence/Attribute:perpetual/Value:no+' => 'no~~',
'Class:Licence/Attribute:perpetual/Value:yes' => 'yes~~',
'Class:Licence/Attribute:perpetual/Value:yes+' => 'yes~~',
- 'Class:Licence/Attribute:finalclass' => 'Type~~',
+ 'Class:Licence/Attribute:finalclass' => 'License sub-class~~',
'Class:Licence/Attribute:finalclass+' => 'Name of the final class~~',
));
@@ -1008,7 +1008,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
//
Dict::Add('IT IT', 'Italian', 'Italiano', array(
- 'Class:OSLicence' => 'OS Licence~~',
+ 'Class:OSLicence' => 'OS License~~',
'Class:OSLicence+' => '~~',
'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~',
'Class:OSLicence/Attribute:osversion_id' => 'OS version~~',
@@ -1016,9 +1016,9 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:OSLicence/Attribute:osversion_name' => 'OS version name~~',
'Class:OSLicence/Attribute:osversion_name+' => '~~',
'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtual machines~~',
- 'Class:OSLicence/Attribute:virtualmachines_list+' => 'All the virtual machines where this licence is used~~',
- 'Class:OSLicence/Attribute:servers_list' => 'servers~~',
- 'Class:OSLicence/Attribute:servers_list+' => 'All the servers where this licence is used~~',
+ 'Class:OSLicence/Attribute:virtualmachines_list+' => 'All the virtual machines where this license is used~~',
+ 'Class:OSLicence/Attribute:servers_list' => 'Servers~~',
+ 'Class:OSLicence/Attribute:servers_list+' => 'All the servers where this license is used~~',
));
//
@@ -1026,7 +1026,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
//
Dict::Add('IT IT', 'Italian', 'Italiano', array(
- 'Class:SoftwareLicence' => 'Software Licence~~',
+ 'Class:SoftwareLicence' => 'Software License~~',
'Class:SoftwareLicence+' => '~~',
'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s~~',
'Class:SoftwareLicence/Attribute:software_id' => 'Software~~',
@@ -1034,7 +1034,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:SoftwareLicence/Attribute:software_name' => 'Software name~~',
'Class:SoftwareLicence/Attribute:software_name+' => '~~',
'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Software instances~~',
- 'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'All the systems where this licence is used~~',
+ 'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'All the systems where this license is used~~',
));
//
@@ -1042,12 +1042,12 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
//
Dict::Add('IT IT', 'Italian', 'Italiano', array(
- 'Class:lnkDocumentToLicence' => 'Link Document / Licence~~',
+ 'Class:lnkDocumentToLicence' => 'Link Document / License~~',
'Class:lnkDocumentToLicence+' => '~~',
'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s~~',
- 'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licence~~',
+ 'Class:lnkDocumentToLicence/Attribute:licence_id' => 'License~~',
'Class:lnkDocumentToLicence/Attribute:licence_id+' => '~~',
- 'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licence name~~',
+ 'Class:lnkDocumentToLicence/Attribute:licence_name' => 'License name~~',
'Class:lnkDocumentToLicence/Attribute:licence_name+' => '~~',
'Class:lnkDocumentToLicence/Attribute:document_id' => 'Document~~',
'Class:lnkDocumentToLicence/Attribute:document_id+' => '~~',
@@ -1257,8 +1257,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:Subnet/Attribute:subnet_name+' => '~~',
'Class:Subnet/Attribute:org_id' => 'Organizzazione proprietaria',
'Class:Subnet/Attribute:org_id+' => '',
- 'Class:Subnet/Attribute:org_name' => 'Name~~',
- 'Class:Subnet/Attribute:org_name+' => 'Common name~~',
+ 'Class:Subnet/Attribute:org_name' => 'Organization name~~',
+ 'Class:Subnet/Attribute:org_name+' => '~~',
'Class:Subnet/Attribute:ip' => 'IP',
'Class:Subnet/Attribute:ip+' => '',
'Class:Subnet/Attribute:ip_mask' => 'IP Mask',
@@ -1281,7 +1281,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:VLAN/Attribute:org_id' => 'Organization~~',
'Class:VLAN/Attribute:org_id+' => '~~',
'Class:VLAN/Attribute:org_name' => 'Organization name~~',
- 'Class:VLAN/Attribute:org_name+' => 'Common name~~',
+ 'Class:VLAN/Attribute:org_name+' => '~~',
'Class:VLAN/Attribute:subnets_list' => 'Subnets~~',
'Class:VLAN/Attribute:subnets_list+' => '~~',
'Class:VLAN/Attribute:physicalinterfaces_list' => 'Physical network interfaces~~',
@@ -1317,7 +1317,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:NetworkInterface+' => '',
'Class:NetworkInterface/Attribute:name' => 'Name~~',
'Class:NetworkInterface/Attribute:name+' => '~~',
- 'Class:NetworkInterface/Attribute:finalclass' => 'Type~~',
+ 'Class:NetworkInterface/Attribute:finalclass' => 'NetworkInterface sub-class~~',
'Class:NetworkInterface/Attribute:finalclass+' => 'Name of the final class~~',
));
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php
index c3d8b876d..4cf17ab73 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php
@@ -1281,7 +1281,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:VLAN/Attribute:org_id' => 'Organization~~',
'Class:VLAN/Attribute:org_id+' => '~~',
'Class:VLAN/Attribute:org_name' => 'Organization name~~',
- 'Class:VLAN/Attribute:org_name+' => 'Common name~~',
+ 'Class:VLAN/Attribute:org_name+' => '~~',
'Class:VLAN/Attribute:subnets_list' => 'Subnets~~',
'Class:VLAN/Attribute:subnets_list+' => '~~',
'Class:VLAN/Attribute:physicalinterfaces_list' => 'Physical network interfaces~~',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php
index f69ac860d..9a843e1b4 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php
@@ -1286,7 +1286,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:VLAN/Attribute:org_id' => 'Organization~~',
'Class:VLAN/Attribute:org_id+' => '~~',
'Class:VLAN/Attribute:org_name' => 'Organization name~~',
- 'Class:VLAN/Attribute:org_name+' => 'Common name~~',
+ 'Class:VLAN/Attribute:org_name+' => '~~',
'Class:VLAN/Attribute:subnets_list' => 'Subnets~~',
'Class:VLAN/Attribute:subnets_list+' => '~~',
'Class:VLAN/Attribute:physicalinterfaces_list' => 'Physical network interfaces~~',
diff --git a/datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php
index 0e3581b28..380a302c1 100644
--- a/datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php
@@ -21,7 +21,7 @@
* along with iTop. If not, see
*/
Dict::Add('DA DA', 'Danish', 'Dansk', array(
- 'Menu:ConfigEditor' => 'Configuration~~',
+ 'Menu:ConfigEditor' => 'General configuration~~',
'config-edit-title' => 'Configuration File Editor~~',
'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
'config-apply' => 'Apply~~',
diff --git a/datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php
index 86658e3ce..dba98467b 100644
--- a/datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php
@@ -21,7 +21,7 @@
* along with iTop. If not, see
*/
Dict::Add('IT IT', 'Italian', 'Italiano', array(
- 'Menu:ConfigEditor' => 'Configuration~~',
+ 'Menu:ConfigEditor' => 'General configuration~~',
'config-edit-title' => 'Configuration File Editor~~',
'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
'config-apply' => 'Apply~~',
diff --git a/datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php
index 0df367835..93686fd1c 100644
--- a/datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php
@@ -21,7 +21,7 @@
* along with iTop. If not, see
*/
Dict::Add('JA JP', 'Japanese', '日本語', array(
- 'Menu:ConfigEditor' => 'Configuration~~',
+ 'Menu:ConfigEditor' => 'General configuration~~',
'config-edit-title' => 'Configuration File Editor~~',
'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
'config-apply' => 'Apply~~',
diff --git a/datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php
index 5a1d5517a..35dc7db57 100644
--- a/datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php
@@ -21,7 +21,7 @@
* along with iTop. If not, see
*/
Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
- 'Menu:ConfigEditor' => 'Configuration~~',
+ 'Menu:ConfigEditor' => 'General configuration~~',
'config-edit-title' => 'Configuration File Editor~~',
'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
'config-apply' => 'Apply~~',
diff --git a/datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php
index 5579752cb..4bd21a15a 100644
--- a/datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php
@@ -21,7 +21,7 @@
* along with iTop. If not, see
*/
Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
- 'Menu:ConfigEditor' => 'Configuration~~',
+ 'Menu:ConfigEditor' => 'General configuration~~',
'config-edit-title' => 'Configuration File Editor~~',
'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
'config-apply' => 'Apply~~',
diff --git a/datamodels/2.x/itop-core-update/dictionaries/cs.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/cs.dict.itop-core-update.php
index 37d85c5e5..4deff8d96 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/cs.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/cs.dict.itop-core-update.php
@@ -23,9 +23,9 @@
Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
- 'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
+ 'itop-core-update:UI:ConfirmUpdate' => 'Confirm Application Upgrade~~',
+ 'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrading~~',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance in read-only mode. You have to run a setup to return in normal mode.~~',
'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
@@ -62,10 +62,10 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'iTopUpdate:UI:FileUploadMaxSize' => 'File upload max size~~',
'iTopUpdate:UI:PostMaxSize' => 'PHP ini value post_max_size: %1$s~~',
'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini value upload_max_filesize: %1$s~~',
- 'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
- 'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
- 'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
- 'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
+ 'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking files~~',
+ 'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking files failed (%1$s)~~',
+ 'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking files failed (File not exist %1$s)~~',
+ 'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking files failed~~',
'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
@@ -81,7 +81,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
- 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application~~',
'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
diff --git a/datamodels/2.x/itop-core-update/dictionaries/da.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/da.dict.itop-core-update.php
index df26b102e..68fd33802 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/da.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/da.dict.itop-core-update.php
@@ -23,9 +23,9 @@
Dict::Add('DA DA', 'Danish', 'Dansk', array(
'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
- 'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
+ 'itop-core-update:UI:ConfirmUpdate' => 'Confirm Application Upgrade~~',
+ 'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrading~~',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance in read-only mode. You have to run a setup to return in normal mode.',
'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
@@ -62,10 +62,10 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'iTopUpdate:UI:FileUploadMaxSize' => 'File upload max size~~',
'iTopUpdate:UI:PostMaxSize' => 'PHP ini value post_max_size: %1$s~~',
'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini value upload_max_filesize: %1$s~~',
- 'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
- 'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
- 'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
- 'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
+ 'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking files~~',
+ 'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking files failed (%1$s)~~',
+ 'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking files failed (File not exist %1$s)~~',
+ 'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking files failed~~',
'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
@@ -81,7 +81,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
- 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application~~',
'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
diff --git a/datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php
index 9a5cec5d6..4fcb9d912 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php
@@ -23,9 +23,9 @@
Dict::Add('IT IT', 'Italian', 'Italiano', array(
'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
- 'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
+ 'itop-core-update:UI:ConfirmUpdate' => 'Confirm Application Upgrade~~',
+ 'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrading~~',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance in read-only mode. You have to run a setup to return in normal mode.',
'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
@@ -62,10 +62,10 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'iTopUpdate:UI:FileUploadMaxSize' => 'File upload max size~~',
'iTopUpdate:UI:PostMaxSize' => 'PHP ini value post_max_size: %1$s~~',
'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini value upload_max_filesize: %1$s~~',
- 'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
- 'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
- 'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
- 'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
+ 'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking files~~',
+ 'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking files failed (%1$s)~~',
+ 'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking files failed (File not exist %1$s)~~',
+ 'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking files failed~~',
'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
@@ -81,7 +81,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
- 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application~~',
'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
diff --git a/datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php
index 950ac4c07..809d374eb 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php
@@ -23,9 +23,9 @@
Dict::Add('JA JP', 'Japanese', '日本語', array(
'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
- 'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
+ 'itop-core-update:UI:ConfirmUpdate' => 'Confirm Application Upgrade~~',
+ 'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrading~~',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance in read-only mode. You have to run a setup to return in normal mode.',
'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
@@ -62,10 +62,10 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'iTopUpdate:UI:FileUploadMaxSize' => 'File upload max size~~',
'iTopUpdate:UI:PostMaxSize' => 'PHP ini value post_max_size: %1$s~~',
'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini value upload_max_filesize: %1$s~~',
- 'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
- 'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
- 'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
- 'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
+ 'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking files~~',
+ 'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking files failed (%1$s)~~',
+ 'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking files failed (File not exist %1$s)~~',
+ 'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking files failed~~',
'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
@@ -81,7 +81,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
- 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application~~',
'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
diff --git a/datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php
index 063152f3f..aaf99b082 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php
@@ -23,9 +23,9 @@
Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
- 'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
+ 'itop-core-update:UI:ConfirmUpdate' => 'Confirm Application Upgrade~~',
+ 'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrading~~',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance in read-only mode. You have to run a setup to return in normal mode.',
'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
@@ -62,10 +62,10 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'iTopUpdate:UI:FileUploadMaxSize' => 'File upload max size~~',
'iTopUpdate:UI:PostMaxSize' => 'PHP ini value post_max_size: %1$s~~',
'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini value upload_max_filesize: %1$s~~',
- 'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
- 'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
- 'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
- 'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
+ 'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking files~~',
+ 'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking files failed (%1$s)~~',
+ 'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking files failed (File not exist %1$s)~~',
+ 'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking files failed~~',
'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
@@ -81,7 +81,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
- 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application~~',
'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
diff --git a/datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php
index 8f61a725a..32adc5db6 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php
@@ -23,9 +23,9 @@
Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
- 'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
+ 'itop-core-update:UI:ConfirmUpdate' => 'Confirm Application Upgrade~~',
+ 'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrading~~',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance in read-only mode. You have to run a setup to return in normal mode.',
'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
@@ -62,10 +62,10 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'iTopUpdate:UI:FileUploadMaxSize' => 'File upload max size~~',
'iTopUpdate:UI:PostMaxSize' => 'PHP ini value post_max_size: %1$s~~',
'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini value upload_max_filesize: %1$s~~',
- 'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
- 'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
- 'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
- 'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
+ 'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking files~~',
+ 'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking files failed (%1$s)~~',
+ 'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking files failed (File not exist %1$s)~~',
+ 'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking files failed~~',
'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
@@ -81,7 +81,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
- 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application~~',
'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
diff --git a/datamodels/2.x/itop-files-information/dictionaries/cs.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/cs.dict.itop-files-information.php
index a9c396aa8..c638f0584 100644
--- a/datamodels/2.x/itop-files-information/dictionaries/cs.dict.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/dictionaries/cs.dict.itop-files-information.php
@@ -24,7 +24,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
// Errors
'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~',
'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~',
- 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+ 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~',
));
diff --git a/datamodels/2.x/itop-files-information/dictionaries/da.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/da.dict.itop-files-information.php
index 83e43169a..2efdc1e2c 100644
--- a/datamodels/2.x/itop-files-information/dictionaries/da.dict.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/dictionaries/da.dict.itop-files-information.php
@@ -24,7 +24,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
// Errors
'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~',
'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~',
- 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+ 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~',
));
diff --git a/datamodels/2.x/itop-files-information/dictionaries/es_cr.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/es_cr.dict.itop-files-information.php
index 9e9c73c90..9e7768f1b 100644
--- a/datamodels/2.x/itop-files-information/dictionaries/es_cr.dict.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/dictionaries/es_cr.dict.itop-files-information.php
@@ -25,7 +25,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
// Errors
'FilesInformation:Error:MissingFile' => 'Archivo faltante: %1$s',
'FilesInformation:Error:CorruptedFile' => 'El archivo %1$s está corrupto',
- 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+ 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
'FilesInformation:Error:CantWriteToFile' => 'No se puede escribir al archivo %1$s',
));
diff --git a/datamodels/2.x/itop-files-information/dictionaries/it.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/it.dict.itop-files-information.php
index a4cc03d29..0bc7a2f91 100644
--- a/datamodels/2.x/itop-files-information/dictionaries/it.dict.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/dictionaries/it.dict.itop-files-information.php
@@ -24,7 +24,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
// Errors
'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~',
'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~',
- 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+ 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~',
));
diff --git a/datamodels/2.x/itop-files-information/dictionaries/ja.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/ja.dict.itop-files-information.php
index ff4a99766..fc955f93b 100644
--- a/datamodels/2.x/itop-files-information/dictionaries/ja.dict.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/dictionaries/ja.dict.itop-files-information.php
@@ -24,7 +24,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
// Errors
'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~',
'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~',
- 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+ 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~',
));
diff --git a/datamodels/2.x/itop-files-information/dictionaries/nl.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/nl.dict.itop-files-information.php
index 12eace68a..064cc19f8 100644
--- a/datamodels/2.x/itop-files-information/dictionaries/nl.dict.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/dictionaries/nl.dict.itop-files-information.php
@@ -26,7 +26,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
// Errors
'FilesInformation:Error:MissingFile' => 'Ontbrekend bestand: %1$s',
'FilesInformation:Error:CorruptedFile' => 'Corrupt bestand: %1$s',
- 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+ 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
'FilesInformation:Error:CantWriteToFile' => 'Kan niet schrijven naar bestand %1$s',
));
diff --git a/datamodels/2.x/itop-files-information/dictionaries/pt_br.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/pt_br.dict.itop-files-information.php
index b56ded4f5..bc9346f5a 100644
--- a/datamodels/2.x/itop-files-information/dictionaries/pt_br.dict.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/dictionaries/pt_br.dict.itop-files-information.php
@@ -24,7 +24,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
// Errors
'FilesInformation:Error:MissingFile' => 'Arquivo ausente: %1$s',
'FilesInformation:Error:CorruptedFile' => 'Arquivo %1$s está corrompido',
- 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+ 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
'FilesInformation:Error:CantWriteToFile' => 'Sem permissão de escrita no arquivo %1$s',
));
diff --git a/datamodels/2.x/itop-files-information/dictionaries/ru.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/ru.dict.itop-files-information.php
index d1e2b297f..4e4f7399a 100644
--- a/datamodels/2.x/itop-files-information/dictionaries/ru.dict.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/dictionaries/ru.dict.itop-files-information.php
@@ -12,7 +12,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
// Errors
'FilesInformation:Error:MissingFile' => 'Файл %1$s отсутствует',
'FilesInformation:Error:CorruptedFile' => 'Файл %1$s повреждён',
- 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+ 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
'FilesInformation:Error:CantWriteToFile' => 'Невозможно выполнить запись в файл %1$s',
));
diff --git a/datamodels/2.x/itop-files-information/dictionaries/sk.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/sk.dict.itop-files-information.php
index 348d5494c..b50ed1671 100644
--- a/datamodels/2.x/itop-files-information/dictionaries/sk.dict.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/dictionaries/sk.dict.itop-files-information.php
@@ -24,7 +24,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
// Errors
'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~',
'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~',
- 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+ 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~',
));
diff --git a/datamodels/2.x/itop-files-information/dictionaries/tr.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/tr.dict.itop-files-information.php
index a2cf67d8a..d4000e67d 100644
--- a/datamodels/2.x/itop-files-information/dictionaries/tr.dict.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/dictionaries/tr.dict.itop-files-information.php
@@ -24,7 +24,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
// Errors
'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~',
'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~',
- 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+ 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~',
));
diff --git a/datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php
index 3a17dc012..097ce16c3 100644
--- a/datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php
@@ -22,7 +22,7 @@
*/
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
// Errors
- 'FilesInformation:Error:MissingFile' => '文件丢失: %1$s~~',
+ 'FilesInformation:Error:MissingFile' => '文件丢失: %1$s',
'FilesInformation:Error:CorruptedFile' => '文件 %1$s 已损坏',
'FilesInformation:Error:ListCorruptedFile' => '已损坏的文件: %1$s',
'FilesInformation:Error:CantWriteToFile' => '文件 %1$s 无法写入',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/cs.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/cs.dict.itop-hub-connector.php
index 4e26c1ec7..cc65e9078 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/cs.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/cs.dict.itop-hub-connector.php
@@ -30,7 +30,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
- 'Menu:iTopHub:BrowseExtensions:Description' => '
Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !
Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.
By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.
~~',
+ 'Menu:iTopHub:BrowseExtensions:Description' => 'Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !
Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.
By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.
',
'iTopHub:GoBtn' => 'Go To iTop Hub~~',
'iTopHub:CloseBtn' => 'Close~~',
'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/da.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/da.dict.itop-hub-connector.php
index 705d7cf2d..c1acffc12 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/da.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/da.dict.itop-hub-connector.php
@@ -30,7 +30,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
- 'Menu:iTopHub:BrowseExtensions:Description' => 'Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !
Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.
By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.
~~',
+ 'Menu:iTopHub:BrowseExtensions:Description' => 'Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !
Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.
By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.
',
'iTopHub:GoBtn' => 'Go To iTop Hub~~',
'iTopHub:CloseBtn' => 'Close~~',
'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/en.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/en.dict.itop-hub-connector.php
index c9960f7c3..c079ccce5 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/en.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/en.dict.itop-hub-connector.php
@@ -65,7 +65,7 @@ Dict::Add('EN US', 'English', 'English', array(
'iTopHub:Uncompressing' => 'Uncompressing extensions...',
'iTopHub:InstallationWelcome' => 'Installation of the extensions downloaded from iTop Hub',
'iTopHub:DBBackupLabel' => 'Instance backup',
- 'iTopHub:DBBackupSentence' => 'Do a backup of the database and iTop configuration before updating',
+ 'iTopHub:DBBackupSentence' => 'Do a backup of the database and '.ITOP_APPLICATION_SHORT.' configuration before updating',
'iTopHub:DeployBtn' => 'Deploy !',
'iTopHub:DatabaseBackupProgress' => 'Instance backup...',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/it.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/it.dict.itop-hub-connector.php
index 5d499e8f0..75aa7b22c 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/it.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/it.dict.itop-hub-connector.php
@@ -30,7 +30,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
- 'Menu:iTopHub:BrowseExtensions:Description' => 'Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !
Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.
By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.
~~',
+ 'Menu:iTopHub:BrowseExtensions:Description' => 'Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !
Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.
By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.
',
'iTopHub:GoBtn' => 'Go To iTop Hub~~',
'iTopHub:CloseBtn' => 'Close~~',
'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/ja.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/ja.dict.itop-hub-connector.php
index 66616d8a5..10959500a 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/ja.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/ja.dict.itop-hub-connector.php
@@ -24,13 +24,13 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
// Dictionary entries go here
'Menu:iTopHub' => 'iTop Hub~~',
'Menu:iTopHub:Register' => 'Connect to iTop Hub~~',
- 'Menu:iTopHub:Register+' => 'Go to iTop Hub to update your iTop instance~~',
- 'Menu:iTopHub:Register:Description' => 'Get access to your community platform iTop Hub!
Find all the content and information you need, manage your instances through personalized tools & install more extensions.
By connecting to the Hub from this page, you will push information about this iTop instance into the Hub.
~~',
+ 'Menu:iTopHub:Register+' => 'Go to iTop Hub to update your '.ITOP_APPLICATION_SHORT.' instance~~',
+ 'Menu:iTopHub:Register:Description' => 'Get access to your community platform iTop Hub!
Find all the content and information you need, manage your instances through personalized tools & install more extensions.
By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.
',
'Menu:iTopHub:MyExtensions' => 'Deployed extensions~~',
'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
- 'Menu:iTopHub:BrowseExtensions:Description' => 'Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !
Find the ones that will help you customize and adapt iTop to your processes.
By connecting to the Hub from this page, you will push information about this iTop instance into the Hub.
~~',
+ 'Menu:iTopHub:BrowseExtensions:Description' => 'Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !
Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.
By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.
',
'iTopHub:GoBtn' => 'Go To iTop Hub~~',
'iTopHub:CloseBtn' => 'Close~~',
'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
@@ -45,7 +45,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'iTopHub:Landing:Status' => 'Deployment status~~',
'iTopHub:Landing:Install' => 'Deploying extensions...~~',
'iTopHub:CompiledOK' => 'Compilation successful.~~',
- 'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!
iTop configuration has NOT been modified.~~',
+ 'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!
'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
'iTopHub:InstalledExtensions' => 'Extensions deployed on this instance~~',
'iTopHub:ExtensionCategory:Manual' => 'Extensions deployed manually~~',
@@ -53,7 +53,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'iTopHub:ExtensionCategory:Remote' => 'Extensions deployed from iTop Hub~~',
'iTopHub:ExtensionCategory:Remote+' => 'The following extensions have been deployed from iTop Hub:~~',
'iTopHub:NoExtensionInThisCategory' => 'There is no extension in this category~~',
- 'iTopHub:NoExtensionInThisCategory+' => 'Browse iTop Hub to find the extensions that will help you customize and adapt iTop to your processes !~~',
+ 'iTopHub:NoExtensionInThisCategory+' => 'Browse iTop Hub to find the extensions that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes !',
'iTopHub:ExtensionNotInstalled' => 'Not installed~~',
'iTopHub:GetMoreExtensions' => 'Get extensions from iTop Hub...~~',
'iTopHub:LandingWelcome' => 'Congratulations! The following extensions were downloaded from iTop Hub and deployed into your '.ITOP_APPLICATION_SHORT.'.~~',
@@ -61,7 +61,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'iTopHub:Uncompressing' => 'Uncompressing extensions...~~',
'iTopHub:InstallationWelcome' => 'Installation of the extensions downloaded from iTop Hub~~',
'iTopHub:DBBackupLabel' => 'Instance backup~~',
- 'iTopHub:DBBackupSentence' => 'Do a backup of the database and iTop configuration before updating~~',
+ 'iTopHub:DBBackupSentence' => 'Do a backup of the database and '.ITOP_APPLICATION_SHORT.' configuration before updating',
'iTopHub:DeployBtn' => 'Deploy !~~',
'iTopHub:DatabaseBackupProgress' => 'Instance backup...~~',
'iTopHub:InstallationEffect:Install' => 'Version: %1$s will be installed.~~',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/ru.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/ru.dict.itop-hub-connector.php
index efdd11db2..f075f1350 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/ru.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/ru.dict.itop-hub-connector.php
@@ -18,7 +18,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Menu:iTopHub:MyExtensions+' => 'Расширения, развернутые на данном экземпляре '.ITOP_APPLICATION_SHORT,
'Menu:iTopHub:BrowseExtensions' => 'Получить расширения из iTop Hub',
'Menu:iTopHub:BrowseExtensions+' => 'Найдите дополнительные расширения на iTop Hub',
- 'Menu:iTopHub:BrowseExtensions:Description' => 'Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !
Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.
By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.
~~',
+ 'Menu:iTopHub:BrowseExtensions:Description' => 'Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !
Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.
By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.
',
'iTopHub:GoBtn' => 'Go To iTop Hub~~',
'iTopHub:CloseBtn' => 'Close~~',
'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/sk.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/sk.dict.itop-hub-connector.php
index f4559866c..1c6e2f857 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/sk.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/sk.dict.itop-hub-connector.php
@@ -30,7 +30,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
- 'Menu:iTopHub:BrowseExtensions:Description' => 'Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !
Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.
By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.
~~',
+ 'Menu:iTopHub:BrowseExtensions:Description' => 'Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !
Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.
By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.
',
'iTopHub:GoBtn' => 'Go To iTop Hub~~',
'iTopHub:CloseBtn' => 'Close~~',
'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/tr.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/tr.dict.itop-hub-connector.php
index 526f865f3..ef0f635d6 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/tr.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/tr.dict.itop-hub-connector.php
@@ -30,7 +30,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
- 'Menu:iTopHub:BrowseExtensions:Description' => 'Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !
Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.
By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.
~~',
+ 'Menu:iTopHub:BrowseExtensions:Description' => 'Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !
Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.
By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.
',
'iTopHub:GoBtn' => 'Go To iTop Hub~~',
'iTopHub:CloseBtn' => 'Close~~',
'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/hu.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/hu.dict.itop-incident-mgmt-itil.php
index 480beea71..6df64e6e3 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/hu.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/hu.dict.itop-incident-mgmt-itil.php
@@ -91,23 +91,23 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:Incident/Attribute:priority' => 'Prioritás',
'Class:Incident/Attribute:priority+' => '~~',
'Class:Incident/Attribute:priority/Value:1' => 'Kritikus',
- 'Class:Incident/Attribute:priority/Value:1+' => 'critical~~',
+ 'Class:Incident/Attribute:priority/Value:1+' => '',
'Class:Incident/Attribute:priority/Value:2' => 'Magas',
- 'Class:Incident/Attribute:priority/Value:2+' => 'high~~',
+ 'Class:Incident/Attribute:priority/Value:2+' => '',
'Class:Incident/Attribute:priority/Value:3' => 'Közepes',
- 'Class:Incident/Attribute:priority/Value:3+' => 'medium~~',
+ 'Class:Incident/Attribute:priority/Value:3+' => '',
'Class:Incident/Attribute:priority/Value:4' => 'Alacsony',
- 'Class:Incident/Attribute:priority/Value:4+' => 'low~~',
+ 'Class:Incident/Attribute:priority/Value:4+' => '',
'Class:Incident/Attribute:urgency' => 'Sürgősség',
'Class:Incident/Attribute:urgency+' => '~~',
'Class:Incident/Attribute:urgency/Value:1' => 'Nem várhat',
- 'Class:Incident/Attribute:urgency/Value:1+' => 'critical~~',
+ 'Class:Incident/Attribute:urgency/Value:1+' => '',
'Class:Incident/Attribute:urgency/Value:2' => 'Nagyon sürgős',
- 'Class:Incident/Attribute:urgency/Value:2+' => 'high~~',
+ 'Class:Incident/Attribute:urgency/Value:2+' => '',
'Class:Incident/Attribute:urgency/Value:3' => 'Sürgős',
'Class:Incident/Attribute:urgency/Value:3+' => 'sürgős',
'Class:Incident/Attribute:urgency/Value:4' => 'Nem sürgős',
- 'Class:Incident/Attribute:urgency/Value:4+' => 'low~~',
+ 'Class:Incident/Attribute:urgency/Value:4+' => '',
'Class:Incident/Attribute:origin' => 'Eredet',
'Class:Incident/Attribute:origin+' => '~~',
'Class:Incident/Attribute:origin/Value:in_person' => 'In-person~~',
@@ -115,13 +115,13 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:Incident/Attribute:origin/Value:chat' => 'Chat~~',
'Class:Incident/Attribute:origin/Value:chat+' => 'Incident created following a ~~',
'Class:Incident/Attribute:origin/Value:mail' => 'Email',
- 'Class:Incident/Attribute:origin/Value:mail+' => 'email~~',
+ 'Class:Incident/Attribute:origin/Value:mail+' => 'Incident created on an email reception~~',
'Class:Incident/Attribute:origin/Value:monitoring' => 'Felügyelet',
- 'Class:Incident/Attribute:origin/Value:monitoring+' => 'monitoring~~',
+ 'Class:Incident/Attribute:origin/Value:monitoring+' => 'Incident created on a monitoring alert~~',
'Class:Incident/Attribute:origin/Value:phone' => 'Telefon',
- 'Class:Incident/Attribute:origin/Value:phone+' => 'phone~~',
+ 'Class:Incident/Attribute:origin/Value:phone+' => 'Incident created following a phone call~~',
'Class:Incident/Attribute:origin/Value:portal' => 'Portál',
- 'Class:Incident/Attribute:origin/Value:portal+' => 'portal~~',
+ 'Class:Incident/Attribute:origin/Value:portal+' => 'Incident created on the user portal~~',
'Class:Incident/Attribute:service_id' => 'Szolgáltatás',
'Class:Incident/Attribute:service_id+' => '~~',
'Class:Incident/Attribute:service_name' => 'Szolgáltatás név',
@@ -133,9 +133,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:Incident/Attribute:escalation_flag' => 'Sürgősség jelzés',
'Class:Incident/Attribute:escalation_flag+' => '~~',
'Class:Incident/Attribute:escalation_flag/Value:no' => 'Nem',
- 'Class:Incident/Attribute:escalation_flag/Value:no+' => 'No~~',
+ 'Class:Incident/Attribute:escalation_flag/Value:no+' => '',
'Class:Incident/Attribute:escalation_flag/Value:yes' => 'Igen',
- 'Class:Incident/Attribute:escalation_flag/Value:yes+' => 'Yes~~',
+ 'Class:Incident/Attribute:escalation_flag/Value:yes+' => '',
'Class:Incident/Attribute:escalation_reason' => 'Sürgősségi ok',
'Class:Incident/Attribute:escalation_reason+' => '~~',
'Class:Incident/Attribute:assignment_date' => 'Megbízás dátuma',
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/sk.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/sk.dict.itop-incident-mgmt-itil.php
index 827dc1e5a..5b29731e0 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/sk.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/sk.dict.itop-incident-mgmt-itil.php
@@ -22,9 +22,9 @@
*/
Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Menu:IncidentManagement' => 'Incident Management~~',
- 'Menu:IncidentManagement+' => 'Incident Management~~',
+ 'Menu:IncidentManagement+' => '',
'Menu:Incident:Overview' => 'Overview~~',
- 'Menu:Incident:Overview+' => 'Overview~~',
+ 'Menu:Incident:Overview+' => '',
'Menu:NewIncident' => 'New incident~~',
'Menu:NewIncident+' => 'Create a new incident ticket~~',
'Menu:SearchIncidents' => 'Search for incidents~~',
@@ -34,9 +34,9 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Menu:Incident:MyIncidents' => 'Incidents assigned to me~~',
'Menu:Incident:MyIncidents+' => 'Incidents assigned to me (as Agent)~~',
'Menu:Incident:EscalatedIncidents' => 'Escalated incidents~~',
- 'Menu:Incident:EscalatedIncidents+' => 'Escalated incidents~~',
+ 'Menu:Incident:EscalatedIncidents+' => '',
'Menu:Incident:OpenIncidents' => 'All open incidents~~',
- 'Menu:Incident:OpenIncidents+' => 'All open incidents~~',
+ 'Menu:Incident:OpenIncidents+' => '',
'UI-IncidentManagementOverview-IncidentByPriority-last-14-days' => 'Last 14 days incident per priority~~',
'UI-IncidentManagementOverview-Last-14-days' => 'Last 14 days number of incidents~~',
'UI-IncidentManagementOverview-OpenIncidentByStatus' => 'Open incidents by status~~',
@@ -90,38 +90,38 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:Incident/Attribute:impact/Value:3+' => '~~',
'Class:Incident/Attribute:priority' => 'Priority~~',
'Class:Incident/Attribute:priority+' => '~~',
- 'Class:Incident/Attribute:priority/Value:1' => 'critical~~',
- 'Class:Incident/Attribute:priority/Value:1+' => 'critical~~',
- 'Class:Incident/Attribute:priority/Value:2' => 'high~~',
- 'Class:Incident/Attribute:priority/Value:2+' => 'high~~',
- 'Class:Incident/Attribute:priority/Value:3' => 'medium~~',
- 'Class:Incident/Attribute:priority/Value:3+' => 'medium~~',
- 'Class:Incident/Attribute:priority/Value:4' => 'low~~',
- 'Class:Incident/Attribute:priority/Value:4+' => 'low~~',
+ 'Class:Incident/Attribute:priority/Value:1' => 'Critical~~',
+ 'Class:Incident/Attribute:priority/Value:1+' => '',
+ 'Class:Incident/Attribute:priority/Value:2' => 'High~~',
+ 'Class:Incident/Attribute:priority/Value:2+' => '',
+ 'Class:Incident/Attribute:priority/Value:3' => 'Medium~~',
+ 'Class:Incident/Attribute:priority/Value:3+' => '',
+ 'Class:Incident/Attribute:priority/Value:4' => 'Low~~',
+ 'Class:Incident/Attribute:priority/Value:4+' => '',
'Class:Incident/Attribute:urgency' => 'Urgency~~',
'Class:Incident/Attribute:urgency+' => '~~',
- 'Class:Incident/Attribute:urgency/Value:1' => 'critical~~',
- 'Class:Incident/Attribute:urgency/Value:1+' => 'critical~~',
- 'Class:Incident/Attribute:urgency/Value:2' => 'high~~',
- 'Class:Incident/Attribute:urgency/Value:2+' => 'high~~',
- 'Class:Incident/Attribute:urgency/Value:3' => 'medium~~',
- 'Class:Incident/Attribute:urgency/Value:3+' => 'medium~~',
- 'Class:Incident/Attribute:urgency/Value:4' => 'low~~',
- 'Class:Incident/Attribute:urgency/Value:4+' => 'low~~',
+ 'Class:Incident/Attribute:urgency/Value:1' => 'Critical~~',
+ 'Class:Incident/Attribute:urgency/Value:1+' => '',
+ 'Class:Incident/Attribute:urgency/Value:2' => 'High~~',
+ 'Class:Incident/Attribute:urgency/Value:2+' => '',
+ 'Class:Incident/Attribute:urgency/Value:3' => 'Medium~~',
+ 'Class:Incident/Attribute:urgency/Value:3+' => '',
+ 'Class:Incident/Attribute:urgency/Value:4' => 'Low~~',
+ 'Class:Incident/Attribute:urgency/Value:4+' => '',
'Class:Incident/Attribute:origin' => 'Origin~~',
'Class:Incident/Attribute:origin+' => '~~',
'Class:Incident/Attribute:origin/Value:in_person' => 'In-person~~',
'Class:Incident/Attribute:origin/Value:in_person+' => 'Incident created following a face-to-face discussion~~',
'Class:Incident/Attribute:origin/Value:chat' => 'Chat~~',
'Class:Incident/Attribute:origin/Value:chat+' => 'Incident created following a ~~',
- 'Class:Incident/Attribute:origin/Value:mail' => 'email~~',
- 'Class:Incident/Attribute:origin/Value:mail+' => 'email~~',
- 'Class:Incident/Attribute:origin/Value:monitoring' => 'monitoring~~',
- 'Class:Incident/Attribute:origin/Value:monitoring+' => 'monitoring~~',
- 'Class:Incident/Attribute:origin/Value:phone' => 'phone~~',
- 'Class:Incident/Attribute:origin/Value:phone+' => 'phone~~',
- 'Class:Incident/Attribute:origin/Value:portal' => 'portal~~',
- 'Class:Incident/Attribute:origin/Value:portal+' => 'portal~~',
+ 'Class:Incident/Attribute:origin/Value:mail' => 'Email~~',
+ 'Class:Incident/Attribute:origin/Value:mail+' => 'Incident created on an email reception~~',
+ 'Class:Incident/Attribute:origin/Value:monitoring' => 'Monitoring~~',
+ 'Class:Incident/Attribute:origin/Value:monitoring+' => 'Incident created on a monitoring alert~~',
+ 'Class:Incident/Attribute:origin/Value:phone' => 'Phone~~',
+ 'Class:Incident/Attribute:origin/Value:phone+' => 'Incident created following a phone call~~',
+ 'Class:Incident/Attribute:origin/Value:portal' => 'Portal~~',
+ 'Class:Incident/Attribute:origin/Value:portal+' => 'Incident created on the user portal~~',
'Class:Incident/Attribute:service_id' => 'Service~~',
'Class:Incident/Attribute:service_id+' => '~~',
'Class:Incident/Attribute:service_name' => 'Service name~~',
@@ -133,9 +133,9 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:Incident/Attribute:escalation_flag' => 'Hot Flag~~',
'Class:Incident/Attribute:escalation_flag+' => '~~',
'Class:Incident/Attribute:escalation_flag/Value:no' => 'No~~',
- 'Class:Incident/Attribute:escalation_flag/Value:no+' => 'No~~',
+ 'Class:Incident/Attribute:escalation_flag/Value:no+' => '',
'Class:Incident/Attribute:escalation_flag/Value:yes' => 'Yes~~',
- 'Class:Incident/Attribute:escalation_flag/Value:yes+' => 'Yes~~',
+ 'Class:Incident/Attribute:escalation_flag/Value:yes+' => '',
'Class:Incident/Attribute:escalation_reason' => 'Hot reason~~',
'Class:Incident/Attribute:escalation_reason+' => '~~',
'Class:Incident/Attribute:assignment_date' => 'Assignment date~~',
@@ -146,9 +146,9 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:Incident/Attribute:last_pending_date+' => '~~',
'Class:Incident/Attribute:cumulatedpending' => 'Cumulated pending~~',
'Class:Incident/Attribute:cumulatedpending+' => '~~',
- 'Class:Incident/Attribute:tto' => 'tto~~',
+ 'Class:Incident/Attribute:tto' => 'TTO~~',
'Class:Incident/Attribute:tto+' => '~~',
- 'Class:Incident/Attribute:ttr' => 'ttr~~',
+ 'Class:Incident/Attribute:ttr' => 'TTR~~',
'Class:Incident/Attribute:ttr+' => '~~',
'Class:Incident/Attribute:tto_escalation_deadline' => 'TTO Deadline~~',
'Class:Incident/Attribute:tto_escalation_deadline+' => '~~',
@@ -166,20 +166,20 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:Incident/Attribute:time_spent+' => '~~',
'Class:Incident/Attribute:resolution_code' => 'Resolution code~~',
'Class:Incident/Attribute:resolution_code+' => '~~',
- 'Class:Incident/Attribute:resolution_code/Value:assistance' => 'assistance~~',
- 'Class:Incident/Attribute:resolution_code/Value:assistance+' => 'assistance~~',
- 'Class:Incident/Attribute:resolution_code/Value:bug fixed' => 'bug fixed~~',
- 'Class:Incident/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed~~',
- 'Class:Incident/Attribute:resolution_code/Value:hardware repair' => 'hardware repair~~',
- 'Class:Incident/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair~~',
- 'Class:Incident/Attribute:resolution_code/Value:other' => 'other~~',
- 'Class:Incident/Attribute:resolution_code/Value:other+' => 'other~~',
- 'Class:Incident/Attribute:resolution_code/Value:software patch' => 'software patch~~',
- 'Class:Incident/Attribute:resolution_code/Value:software patch+' => 'software patch~~',
- 'Class:Incident/Attribute:resolution_code/Value:system update' => 'system update~~',
- 'Class:Incident/Attribute:resolution_code/Value:system update+' => 'system update~~',
- 'Class:Incident/Attribute:resolution_code/Value:training' => 'training~~',
- 'Class:Incident/Attribute:resolution_code/Value:training+' => 'training~~',
+ 'Class:Incident/Attribute:resolution_code/Value:assistance' => 'Assistance~~',
+ 'Class:Incident/Attribute:resolution_code/Value:assistance+' => '',
+ 'Class:Incident/Attribute:resolution_code/Value:bug fixed' => 'Bug fixed~~',
+ 'Class:Incident/Attribute:resolution_code/Value:bug fixed+' => '',
+ 'Class:Incident/Attribute:resolution_code/Value:hardware repair' => 'Hardware repair~~',
+ 'Class:Incident/Attribute:resolution_code/Value:hardware repair+' => '',
+ 'Class:Incident/Attribute:resolution_code/Value:other' => 'Other~~',
+ 'Class:Incident/Attribute:resolution_code/Value:other+' => '',
+ 'Class:Incident/Attribute:resolution_code/Value:software patch' => 'Software patch~~',
+ 'Class:Incident/Attribute:resolution_code/Value:software patch+' => '',
+ 'Class:Incident/Attribute:resolution_code/Value:system update' => 'System update~~',
+ 'Class:Incident/Attribute:resolution_code/Value:system update+' => '',
+ 'Class:Incident/Attribute:resolution_code/Value:training' => 'Training~~',
+ 'Class:Incident/Attribute:resolution_code/Value:training+' => '',
'Class:Incident/Attribute:solution' => 'Solution~~',
'Class:Incident/Attribute:solution+' => '~~',
'Class:Incident/Attribute:pending_reason' => 'Pending reason~~',
@@ -205,13 +205,13 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:Incident/Attribute:user_satisfaction' => 'User satisfaction~~',
'Class:Incident/Attribute:user_satisfaction+' => '~~',
'Class:Incident/Attribute:user_satisfaction/Value:1' => 'Very satisfied~~',
- 'Class:Incident/Attribute:user_satisfaction/Value:1+' => 'Very satisfied~~',
+ 'Class:Incident/Attribute:user_satisfaction/Value:1+' => '',
'Class:Incident/Attribute:user_satisfaction/Value:2' => 'Fairly statisfied~~',
- 'Class:Incident/Attribute:user_satisfaction/Value:2+' => 'Fairly statisfied~~',
+ 'Class:Incident/Attribute:user_satisfaction/Value:2+' => '',
'Class:Incident/Attribute:user_satisfaction/Value:3' => 'Rather Dissatified~~',
- 'Class:Incident/Attribute:user_satisfaction/Value:3+' => 'Rather Dissatified~~',
+ 'Class:Incident/Attribute:user_satisfaction/Value:3+' => '',
'Class:Incident/Attribute:user_satisfaction/Value:4' => 'Very Dissatisfied~~',
- 'Class:Incident/Attribute:user_satisfaction/Value:4+' => 'Very Dissatisfied~~',
+ 'Class:Incident/Attribute:user_satisfaction/Value:4+' => '',
'Class:Incident/Attribute:user_comment' => 'User comment~~',
'Class:Incident/Attribute:user_comment+' => '~~',
'Class:Incident/Attribute:parent_incident_id_friendlyname' => 'parent_incident_id_friendlyname~~',
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/tr.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/tr.dict.itop-incident-mgmt-itil.php
index 0cd526eb0..2cfbf7ca3 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/tr.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/tr.dict.itop-incident-mgmt-itil.php
@@ -22,9 +22,9 @@
*/
Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Menu:IncidentManagement' => 'Incident Management~~',
- 'Menu:IncidentManagement+' => 'Incident Management~~',
+ 'Menu:IncidentManagement+' => '',
'Menu:Incident:Overview' => 'Overview~~',
- 'Menu:Incident:Overview+' => 'Overview~~',
+ 'Menu:Incident:Overview+' => '',
'Menu:NewIncident' => 'New incident~~',
'Menu:NewIncident+' => 'Create a new incident ticket~~',
'Menu:SearchIncidents' => 'Search for incidents~~',
@@ -34,9 +34,9 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Menu:Incident:MyIncidents' => 'Incidents assigned to me~~',
'Menu:Incident:MyIncidents+' => 'Incidents assigned to me (as Agent)~~',
'Menu:Incident:EscalatedIncidents' => 'Escalated incidents~~',
- 'Menu:Incident:EscalatedIncidents+' => 'Escalated incidents~~',
+ 'Menu:Incident:EscalatedIncidents+' => '',
'Menu:Incident:OpenIncidents' => 'All open incidents~~',
- 'Menu:Incident:OpenIncidents+' => 'All open incidents~~',
+ 'Menu:Incident:OpenIncidents+' => '',
'UI-IncidentManagementOverview-IncidentByPriority-last-14-days' => 'Last 14 days incident per priority~~',
'UI-IncidentManagementOverview-Last-14-days' => 'Last 14 days number of incidents~~',
'UI-IncidentManagementOverview-OpenIncidentByStatus' => 'Open incidents by status~~',
@@ -90,38 +90,38 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:Incident/Attribute:impact/Value:3+' => '~~',
'Class:Incident/Attribute:priority' => 'Priority~~',
'Class:Incident/Attribute:priority+' => '~~',
- 'Class:Incident/Attribute:priority/Value:1' => 'critical~~',
- 'Class:Incident/Attribute:priority/Value:1+' => 'critical~~',
- 'Class:Incident/Attribute:priority/Value:2' => 'high~~',
- 'Class:Incident/Attribute:priority/Value:2+' => 'high~~',
- 'Class:Incident/Attribute:priority/Value:3' => 'medium~~',
- 'Class:Incident/Attribute:priority/Value:3+' => 'medium~~',
- 'Class:Incident/Attribute:priority/Value:4' => 'low~~',
- 'Class:Incident/Attribute:priority/Value:4+' => 'low~~',
+ 'Class:Incident/Attribute:priority/Value:1' => 'Critical~~',
+ 'Class:Incident/Attribute:priority/Value:1+' => '',
+ 'Class:Incident/Attribute:priority/Value:2' => 'High~~',
+ 'Class:Incident/Attribute:priority/Value:2+' => '',
+ 'Class:Incident/Attribute:priority/Value:3' => 'Medium~~',
+ 'Class:Incident/Attribute:priority/Value:3+' => '',
+ 'Class:Incident/Attribute:priority/Value:4' => 'Low~~',
+ 'Class:Incident/Attribute:priority/Value:4+' => '',
'Class:Incident/Attribute:urgency' => 'Urgency~~',
'Class:Incident/Attribute:urgency+' => '~~',
- 'Class:Incident/Attribute:urgency/Value:1' => 'critical~~',
- 'Class:Incident/Attribute:urgency/Value:1+' => 'critical~~',
- 'Class:Incident/Attribute:urgency/Value:2' => 'high~~',
- 'Class:Incident/Attribute:urgency/Value:2+' => 'high~~',
- 'Class:Incident/Attribute:urgency/Value:3' => 'medium~~',
- 'Class:Incident/Attribute:urgency/Value:3+' => 'medium~~',
- 'Class:Incident/Attribute:urgency/Value:4' => 'low~~',
- 'Class:Incident/Attribute:urgency/Value:4+' => 'low~~',
+ 'Class:Incident/Attribute:urgency/Value:1' => 'Critical~~',
+ 'Class:Incident/Attribute:urgency/Value:1+' => '',
+ 'Class:Incident/Attribute:urgency/Value:2' => 'High~~',
+ 'Class:Incident/Attribute:urgency/Value:2+' => '',
+ 'Class:Incident/Attribute:urgency/Value:3' => 'Medium~~',
+ 'Class:Incident/Attribute:urgency/Value:3+' => '',
+ 'Class:Incident/Attribute:urgency/Value:4' => 'Low~~',
+ 'Class:Incident/Attribute:urgency/Value:4+' => '',
'Class:Incident/Attribute:origin' => 'Origin~~',
'Class:Incident/Attribute:origin+' => '~~',
'Class:Incident/Attribute:origin/Value:in_person' => 'In-person~~',
'Class:Incident/Attribute:origin/Value:in_person+' => 'Incident created following a face-to-face discussion~~',
'Class:Incident/Attribute:origin/Value:chat' => 'Chat~~',
'Class:Incident/Attribute:origin/Value:chat+' => 'Incident created following a ~~',
- 'Class:Incident/Attribute:origin/Value:mail' => 'email~~',
- 'Class:Incident/Attribute:origin/Value:mail+' => 'email~~',
- 'Class:Incident/Attribute:origin/Value:monitoring' => 'monitoring~~',
- 'Class:Incident/Attribute:origin/Value:monitoring+' => 'monitoring~~',
- 'Class:Incident/Attribute:origin/Value:phone' => 'phone~~',
- 'Class:Incident/Attribute:origin/Value:phone+' => 'phone~~',
- 'Class:Incident/Attribute:origin/Value:portal' => 'portal~~',
- 'Class:Incident/Attribute:origin/Value:portal+' => 'portal~~',
+ 'Class:Incident/Attribute:origin/Value:mail' => 'Email~~',
+ 'Class:Incident/Attribute:origin/Value:mail+' => 'Incident created on an email reception~~',
+ 'Class:Incident/Attribute:origin/Value:monitoring' => 'Monitoring~~',
+ 'Class:Incident/Attribute:origin/Value:monitoring+' => 'Incident created on a monitoring alert~~',
+ 'Class:Incident/Attribute:origin/Value:phone' => 'Phone~~',
+ 'Class:Incident/Attribute:origin/Value:phone+' => 'Incident created following a phone call~~',
+ 'Class:Incident/Attribute:origin/Value:portal' => 'Portal~~',
+ 'Class:Incident/Attribute:origin/Value:portal+' => 'Incident created on the user portal~~',
'Class:Incident/Attribute:service_id' => 'Service~~',
'Class:Incident/Attribute:service_id+' => '~~',
'Class:Incident/Attribute:service_name' => 'Service name~~',
@@ -133,9 +133,9 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:Incident/Attribute:escalation_flag' => 'Hot Flag~~',
'Class:Incident/Attribute:escalation_flag+' => '~~',
'Class:Incident/Attribute:escalation_flag/Value:no' => 'No~~',
- 'Class:Incident/Attribute:escalation_flag/Value:no+' => 'No~~',
+ 'Class:Incident/Attribute:escalation_flag/Value:no+' => '',
'Class:Incident/Attribute:escalation_flag/Value:yes' => 'Yes~~',
- 'Class:Incident/Attribute:escalation_flag/Value:yes+' => 'Yes~~',
+ 'Class:Incident/Attribute:escalation_flag/Value:yes+' => '',
'Class:Incident/Attribute:escalation_reason' => 'Hot reason~~',
'Class:Incident/Attribute:escalation_reason+' => '~~',
'Class:Incident/Attribute:assignment_date' => 'Assignment date~~',
@@ -146,9 +146,9 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:Incident/Attribute:last_pending_date+' => '~~',
'Class:Incident/Attribute:cumulatedpending' => 'Cumulated pending~~',
'Class:Incident/Attribute:cumulatedpending+' => '~~',
- 'Class:Incident/Attribute:tto' => 'tto~~',
+ 'Class:Incident/Attribute:tto' => 'TTO~~',
'Class:Incident/Attribute:tto+' => '~~',
- 'Class:Incident/Attribute:ttr' => 'ttr~~',
+ 'Class:Incident/Attribute:ttr' => 'TTR~~',
'Class:Incident/Attribute:ttr+' => '~~',
'Class:Incident/Attribute:tto_escalation_deadline' => 'TTO Deadline~~',
'Class:Incident/Attribute:tto_escalation_deadline+' => '~~',
@@ -166,20 +166,20 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:Incident/Attribute:time_spent+' => '~~',
'Class:Incident/Attribute:resolution_code' => 'Resolution code~~',
'Class:Incident/Attribute:resolution_code+' => '~~',
- 'Class:Incident/Attribute:resolution_code/Value:assistance' => 'assistance~~',
- 'Class:Incident/Attribute:resolution_code/Value:assistance+' => 'assistance~~',
- 'Class:Incident/Attribute:resolution_code/Value:bug fixed' => 'bug fixed~~',
- 'Class:Incident/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed~~',
- 'Class:Incident/Attribute:resolution_code/Value:hardware repair' => 'hardware repair~~',
- 'Class:Incident/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair~~',
- 'Class:Incident/Attribute:resolution_code/Value:other' => 'other~~',
- 'Class:Incident/Attribute:resolution_code/Value:other+' => 'other~~',
- 'Class:Incident/Attribute:resolution_code/Value:software patch' => 'software patch~~',
- 'Class:Incident/Attribute:resolution_code/Value:software patch+' => 'software patch~~',
- 'Class:Incident/Attribute:resolution_code/Value:system update' => 'system update~~',
- 'Class:Incident/Attribute:resolution_code/Value:system update+' => 'system update~~',
- 'Class:Incident/Attribute:resolution_code/Value:training' => 'training~~',
- 'Class:Incident/Attribute:resolution_code/Value:training+' => 'training~~',
+ 'Class:Incident/Attribute:resolution_code/Value:assistance' => 'Assistance~~',
+ 'Class:Incident/Attribute:resolution_code/Value:assistance+' => '',
+ 'Class:Incident/Attribute:resolution_code/Value:bug fixed' => 'Bug fixed~~',
+ 'Class:Incident/Attribute:resolution_code/Value:bug fixed+' => '',
+ 'Class:Incident/Attribute:resolution_code/Value:hardware repair' => 'Hardware repair~~',
+ 'Class:Incident/Attribute:resolution_code/Value:hardware repair+' => '',
+ 'Class:Incident/Attribute:resolution_code/Value:other' => 'Other~~',
+ 'Class:Incident/Attribute:resolution_code/Value:other+' => '',
+ 'Class:Incident/Attribute:resolution_code/Value:software patch' => 'Software patch~~',
+ 'Class:Incident/Attribute:resolution_code/Value:software patch+' => '',
+ 'Class:Incident/Attribute:resolution_code/Value:system update' => 'System update~~',
+ 'Class:Incident/Attribute:resolution_code/Value:system update+' => '',
+ 'Class:Incident/Attribute:resolution_code/Value:training' => 'Training~~',
+ 'Class:Incident/Attribute:resolution_code/Value:training+' => '',
'Class:Incident/Attribute:solution' => 'Solution~~',
'Class:Incident/Attribute:solution+' => '~~',
'Class:Incident/Attribute:pending_reason' => 'Pending reason~~',
@@ -205,13 +205,13 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:Incident/Attribute:user_satisfaction' => 'User satisfaction~~',
'Class:Incident/Attribute:user_satisfaction+' => '~~',
'Class:Incident/Attribute:user_satisfaction/Value:1' => 'Very satisfied~~',
- 'Class:Incident/Attribute:user_satisfaction/Value:1+' => 'Very satisfied~~',
+ 'Class:Incident/Attribute:user_satisfaction/Value:1+' => '',
'Class:Incident/Attribute:user_satisfaction/Value:2' => 'Fairly statisfied~~',
- 'Class:Incident/Attribute:user_satisfaction/Value:2+' => 'Fairly statisfied~~',
+ 'Class:Incident/Attribute:user_satisfaction/Value:2+' => '',
'Class:Incident/Attribute:user_satisfaction/Value:3' => 'Rather Dissatified~~',
- 'Class:Incident/Attribute:user_satisfaction/Value:3+' => 'Rather Dissatified~~',
+ 'Class:Incident/Attribute:user_satisfaction/Value:3+' => '',
'Class:Incident/Attribute:user_satisfaction/Value:4' => 'Very Dissatisfied~~',
- 'Class:Incident/Attribute:user_satisfaction/Value:4+' => 'Very Dissatisfied~~',
+ 'Class:Incident/Attribute:user_satisfaction/Value:4+' => '',
'Class:Incident/Attribute:user_comment' => 'User comment~~',
'Class:Incident/Attribute:user_comment+' => '~~',
'Class:Incident/Attribute:parent_incident_id_friendlyname' => 'parent_incident_id_friendlyname~~',
diff --git a/datamodels/2.x/itop-oauth-client/dictionaries/cs.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/dictionaries/cs.dict.itop-oauth-client.php
index bd077f715..370e9198e 100644
--- a/datamodels/2.x/itop-oauth-client/dictionaries/cs.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/dictionaries/cs.dict.itop-oauth-client.php
@@ -9,8 +9,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
'Menu:CreateMailbox' => 'Create a mailbox...~~',
'Menu:OAuthClient' => 'OAuth client~~',
'Menu:OAuthClient+' => '~~',
- 'Menu:GenerateTokens' => 'Generate access tokens...~~',
- 'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
+ 'Menu:GenerateTokens' => 'Generate access token...~~',
+ 'Menu:RegenerateTokens' => 'Regenerate access token...~~',
'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
'itop-oauth-client:TestSMTP' => 'Email send test~~',
diff --git a/datamodels/2.x/itop-oauth-client/dictionaries/da.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/dictionaries/da.dict.itop-oauth-client.php
index 61a80fc16..3c1bb9289 100644
--- a/datamodels/2.x/itop-oauth-client/dictionaries/da.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/dictionaries/da.dict.itop-oauth-client.php
@@ -7,10 +7,10 @@
*/
Dict::Add('DA DA', 'Danish', 'Dansk', [
'Menu:CreateMailbox' => 'Create a mailbox...~~',
- 'Menu:OAuthClient' => 'OAuth Client~~',
+ 'Menu:OAuthClient' => 'OAuth client~~',
'Menu:OAuthClient+' => '~~',
- 'Menu:GenerateTokens' => 'Generate access tokens...~~',
- 'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
+ 'Menu:GenerateTokens' => 'Generate access token...~~',
+ 'Menu:RegenerateTokens' => 'Regenerate access token...~~',
'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
'itop-oauth-client:TestSMTP' => 'Email send test~~',
diff --git a/datamodels/2.x/itop-oauth-client/dictionaries/es_cr.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/dictionaries/es_cr.dict.itop-oauth-client.php
index fd9be5ed8..35b737105 100644
--- a/datamodels/2.x/itop-oauth-client/dictionaries/es_cr.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/dictionaries/es_cr.dict.itop-oauth-client.php
@@ -9,8 +9,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
'Menu:CreateMailbox' => 'Create a mailbox...~~',
'Menu:OAuthClient' => 'OAuth client~~',
'Menu:OAuthClient+' => '~~',
- 'Menu:GenerateTokens' => 'Generate access tokens...~~',
- 'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
+ 'Menu:GenerateTokens' => 'Generate access token...~~',
+ 'Menu:RegenerateTokens' => 'Regenerate access token...~~',
'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
'itop-oauth-client:TestSMTP' => 'Email send test~~',
diff --git a/datamodels/2.x/itop-oauth-client/dictionaries/it.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/dictionaries/it.dict.itop-oauth-client.php
index 53123cadf..0d83dc2ff 100644
--- a/datamodels/2.x/itop-oauth-client/dictionaries/it.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/dictionaries/it.dict.itop-oauth-client.php
@@ -9,8 +9,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
'Menu:CreateMailbox' => 'Create a mailbox...~~',
'Menu:OAuthClient' => 'OAuth client~~',
'Menu:OAuthClient+' => '~~',
- 'Menu:GenerateTokens' => 'Generate access tokens...~~',
- 'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
+ 'Menu:GenerateTokens' => 'Generate access token...~~',
+ 'Menu:RegenerateTokens' => 'Regenerate access token...~~',
'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
'itop-oauth-client:TestSMTP' => 'Email send test~~',
diff --git a/datamodels/2.x/itop-oauth-client/dictionaries/ja.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/dictionaries/ja.dict.itop-oauth-client.php
index e8ccd0e7c..038dc9b30 100644
--- a/datamodels/2.x/itop-oauth-client/dictionaries/ja.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/dictionaries/ja.dict.itop-oauth-client.php
@@ -9,8 +9,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
'Menu:CreateMailbox' => 'Create a mailbox...~~',
'Menu:OAuthClient' => 'OAuth client~~',
'Menu:OAuthClient+' => '~~',
- 'Menu:GenerateTokens' => 'Generate access tokens...~~',
- 'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
+ 'Menu:GenerateTokens' => 'Generate access token...~~',
+ 'Menu:RegenerateTokens' => 'Regenerate access token...~~',
'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
'itop-oauth-client:TestSMTP' => 'Email send test~~',
diff --git a/datamodels/2.x/itop-oauth-client/dictionaries/nl.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/dictionaries/nl.dict.itop-oauth-client.php
index f178eea2c..498503aa4 100644
--- a/datamodels/2.x/itop-oauth-client/dictionaries/nl.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/dictionaries/nl.dict.itop-oauth-client.php
@@ -7,10 +7,10 @@
*/
Dict::Add('NL NL', 'Dutch', 'Nederlands', [
'Menu:CreateMailbox' => 'Create a mailbox...~~',
- 'Menu:OAuthClient' => 'OAuth Client~~',
+ 'Menu:OAuthClient' => 'OAuth client~~',
'Menu:OAuthClient+' => '~~',
- 'Menu:GenerateTokens' => 'Generate access tokens...~~',
- 'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
+ 'Menu:GenerateTokens' => 'Generate access token...~~',
+ 'Menu:RegenerateTokens' => 'Regenerate access token...~~',
'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
'itop-oauth-client:TestSMTP' => 'Email send test~~',
diff --git a/datamodels/2.x/itop-oauth-client/dictionaries/pt_br.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/dictionaries/pt_br.dict.itop-oauth-client.php
index 21563f58f..f7a80899b 100644
--- a/datamodels/2.x/itop-oauth-client/dictionaries/pt_br.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/dictionaries/pt_br.dict.itop-oauth-client.php
@@ -9,8 +9,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
'Menu:CreateMailbox' => 'Create a mailbox...~~',
'Menu:OAuthClient' => 'OAuth client~~',
'Menu:OAuthClient+' => '~~',
- 'Menu:GenerateTokens' => 'Generate access tokens...~~',
- 'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
+ 'Menu:GenerateTokens' => 'Generate access token...~~',
+ 'Menu:RegenerateTokens' => 'Regenerate access token...~~',
'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
'itop-oauth-client:TestSMTP' => 'Email send test~~',
diff --git a/datamodels/2.x/itop-oauth-client/dictionaries/ru.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/dictionaries/ru.dict.itop-oauth-client.php
index 1e5d70739..e551121e5 100644
--- a/datamodels/2.x/itop-oauth-client/dictionaries/ru.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/dictionaries/ru.dict.itop-oauth-client.php
@@ -9,8 +9,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
'Menu:CreateMailbox' => 'Create a mailbox...~~',
'Menu:OAuthClient' => 'OAuth client~~',
'Menu:OAuthClient+' => '~~',
- 'Menu:GenerateTokens' => 'Generate access tokens...~~',
- 'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
+ 'Menu:GenerateTokens' => 'Generate access token...~~',
+ 'Menu:RegenerateTokens' => 'Regenerate access token...~~',
'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
'itop-oauth-client:TestSMTP' => 'Email send test~~',
diff --git a/datamodels/2.x/itop-oauth-client/dictionaries/sk.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/dictionaries/sk.dict.itop-oauth-client.php
index 8778fe617..88d0c0c02 100644
--- a/datamodels/2.x/itop-oauth-client/dictionaries/sk.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/dictionaries/sk.dict.itop-oauth-client.php
@@ -9,8 +9,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
'Menu:CreateMailbox' => 'Create a mailbox...~~',
'Menu:OAuthClient' => 'OAuth client~~',
'Menu:OAuthClient+' => '~~',
- 'Menu:GenerateTokens' => 'Generate access tokens...~~',
- 'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
+ 'Menu:GenerateTokens' => 'Generate access token...~~',
+ 'Menu:RegenerateTokens' => 'Regenerate access token...~~',
'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
'itop-oauth-client:TestSMTP' => 'Email send test~~',
diff --git a/datamodels/2.x/itop-oauth-client/dictionaries/tr.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/dictionaries/tr.dict.itop-oauth-client.php
index fcd8de06b..d6d084ac6 100644
--- a/datamodels/2.x/itop-oauth-client/dictionaries/tr.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/dictionaries/tr.dict.itop-oauth-client.php
@@ -9,8 +9,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
'Menu:CreateMailbox' => 'Create a mailbox...~~',
'Menu:OAuthClient' => 'OAuth client~~',
'Menu:OAuthClient+' => '~~',
- 'Menu:GenerateTokens' => 'Generate access tokens...~~',
- 'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
+ 'Menu:GenerateTokens' => 'Generate access token...~~',
+ 'Menu:RegenerateTokens' => 'Regenerate access token...~~',
'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
'itop-oauth-client:TestSMTP' => 'Email send test~~',
diff --git a/datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-oauth-client.php
index 97d6b8a08..4aaa65cc1 100644
--- a/datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-oauth-client.php
@@ -9,8 +9,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
'Menu:CreateMailbox' => 'Create a mailbox...~~',
'Menu:OAuthClient' => 'OAuth client~~',
'Menu:OAuthClient+' => '~~',
- 'Menu:GenerateTokens' => 'Generate access tokens...~~',
- 'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
+ 'Menu:GenerateTokens' => 'Generate access token...~~',
+ 'Menu:RegenerateTokens' => 'Regenerate access token...~~',
'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
'itop-oauth-client:TestSMTP' => 'Email send test~~',
diff --git a/datamodels/2.x/itop-portal-base/dictionaries/cs.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/cs.dict.itop-portal-base.php
index 0bcd0a2b1..38de1ac83 100644
--- a/datamodels/2.x/itop-portal-base/dictionaries/cs.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/cs.dict.itop-portal-base.php
@@ -132,7 +132,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s',
'Brick:Portal:Object:Form:Stimulus:Title' => 'Vyplňte prosím následující informace:',
'Brick:Portal:Object:Form:Message:Saved' => 'Uloženo',
- 'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s uloženo~~',
+ 'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s uloženo',
'Brick:Portal:Object:Search:Regular:Title' => 'Vybrat %1$s (%2$s)',
'Brick:Portal:Object:Search:Hierarchy:Title' => 'Vybrat %1$s (%2$s)',
'Brick:Portal:Object:Copy:TextToCopy' => '%1$s: %2$s~~',
diff --git a/datamodels/2.x/itop-portal-base/dictionaries/da.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/da.dict.itop-portal-base.php
index 8d911ba0b..39b75ccba 100644
--- a/datamodels/2.x/itop-portal-base/dictionaries/da.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/da.dict.itop-portal-base.php
@@ -81,7 +81,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Confirm password~~',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'To change your password, please contact your %1$s administrator~~',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Can\'t change password, please contact your %1$s administrator~~',
- 'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal informations~~',
+ 'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal information~~',
'Brick:Portal:UserProfile:Photo:Title' => 'Photo~~',
));
@@ -129,8 +129,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Brick:Portal:Object:Name' => 'Object~~',
'Brick:Portal:Object:Form:Create:Title' => 'New %1$s~~',
'Brick:Portal:Object:Form:Edit:Title' => 'Updating %2$s (%1$s)~~',
- 'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s~~',
- 'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, fill the following informations:~~',
+ 'Brick:Portal:Object:Form:View:Title' => '%1$s: %2$s~~',
+ 'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, complete the following information:~~',
'Brick:Portal:Object:Form:Message:Saved' => 'Saved~~',
'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s saved~~',
'Brick:Portal:Object:Search:Regular:Title' => 'Select %1$s (%2$s)~~',
diff --git a/datamodels/2.x/itop-portal-base/dictionaries/it.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/it.dict.itop-portal-base.php
index 9b53dcc8f..1e2050fd5 100644
--- a/datamodels/2.x/itop-portal-base/dictionaries/it.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/it.dict.itop-portal-base.php
@@ -81,7 +81,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Confirm password~~',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'To change your password, please contact your %1$s administrator~~',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Can\'t change password, please contact your %1$s administrator~~',
- 'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal informations~~',
+ 'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal information~~',
'Brick:Portal:UserProfile:Photo:Title' => 'Photo~~',
));
@@ -129,8 +129,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Brick:Portal:Object:Name' => 'Object~~',
'Brick:Portal:Object:Form:Create:Title' => 'New %1$s~~',
'Brick:Portal:Object:Form:Edit:Title' => 'Updating %2$s (%1$s)~~',
- 'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s~~',
- 'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, fill the following informations:~~',
+ 'Brick:Portal:Object:Form:View:Title' => '%1$s: %2$s~~',
+ 'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, complete the following information:~~',
'Brick:Portal:Object:Form:Message:Saved' => 'Saved~~',
'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s saved~~',
'Brick:Portal:Object:Search:Regular:Title' => 'Select %1$s (%2$s)~~',
diff --git a/datamodels/2.x/itop-portal-base/dictionaries/ja.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/ja.dict.itop-portal-base.php
index cb27508b5..01bada530 100644
--- a/datamodels/2.x/itop-portal-base/dictionaries/ja.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/ja.dict.itop-portal-base.php
@@ -81,7 +81,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Confirm password~~',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'To change your password, please contact your %1$s administrator~~',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Can\'t change password, please contact your %1$s administrator~~',
- 'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal informations~~',
+ 'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal information~~',
'Brick:Portal:UserProfile:Photo:Title' => 'Photo~~',
));
@@ -129,8 +129,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Brick:Portal:Object:Name' => 'Object~~',
'Brick:Portal:Object:Form:Create:Title' => 'New %1$s~~',
'Brick:Portal:Object:Form:Edit:Title' => 'Updating %2$s (%1$s)~~',
- 'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s~~',
- 'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, fill the following informations:~~',
+ 'Brick:Portal:Object:Form:View:Title' => '%1$s: %2$s~~',
+ 'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, complete the following information:~~',
'Brick:Portal:Object:Form:Message:Saved' => 'Saved~~',
'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s saved~~',
'Brick:Portal:Object:Search:Regular:Title' => 'Select %1$s (%2$s)~~',
diff --git a/datamodels/2.x/itop-portal-base/dictionaries/sk.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/sk.dict.itop-portal-base.php
index 3aa3bf602..f8baa763b 100644
--- a/datamodels/2.x/itop-portal-base/dictionaries/sk.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/sk.dict.itop-portal-base.php
@@ -81,7 +81,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Confirm password~~',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'To change your password, please contact your %1$s administrator~~',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Can\'t change password, please contact your %1$s administrator~~',
- 'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal informations~~',
+ 'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal information~~',
'Brick:Portal:UserProfile:Photo:Title' => 'Photo~~',
));
@@ -129,8 +129,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Brick:Portal:Object:Name' => 'Object~~',
'Brick:Portal:Object:Form:Create:Title' => 'New %1$s~~',
'Brick:Portal:Object:Form:Edit:Title' => 'Updating %2$s (%1$s)~~',
- 'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s~~',
- 'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, fill the following informations:~~',
+ 'Brick:Portal:Object:Form:View:Title' => '%1$s: %2$s~~',
+ 'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, complete the following information:~~',
'Brick:Portal:Object:Form:Message:Saved' => 'Saved~~',
'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s saved~~',
'Brick:Portal:Object:Search:Regular:Title' => 'Select %1$s (%2$s)~~',
diff --git a/datamodels/2.x/itop-portal-base/dictionaries/tr.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/tr.dict.itop-portal-base.php
index 355c73805..ceb3566bf 100644
--- a/datamodels/2.x/itop-portal-base/dictionaries/tr.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/tr.dict.itop-portal-base.php
@@ -81,7 +81,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Confirm password~~',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'To change your password, please contact your %1$s administrator~~',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Can\'t change password, please contact your %1$s administrator~~',
- 'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal informations~~',
+ 'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal information~~',
'Brick:Portal:UserProfile:Photo:Title' => 'Photo~~',
));
@@ -129,8 +129,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Brick:Portal:Object:Name' => 'Object~~',
'Brick:Portal:Object:Form:Create:Title' => 'New %1$s~~',
'Brick:Portal:Object:Form:Edit:Title' => 'Updating %2$s (%1$s)~~',
- 'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s~~',
- 'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, fill the following informations:~~',
+ 'Brick:Portal:Object:Form:View:Title' => '%1$s: %2$s~~',
+ 'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, complete the following information:~~',
'Brick:Portal:Object:Form:Message:Saved' => 'Saved~~',
'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s saved~~',
'Brick:Portal:Object:Search:Regular:Title' => 'Select %1$s (%2$s)~~',
diff --git a/datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php
index ef341eddf..850130492 100644
--- a/datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php
@@ -132,7 +132,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s',
'Brick:Portal:Object:Form:Stimulus:Title' => '请填写下列信息:',
'Brick:Portal:Object:Form:Message:Saved' => '已保存',
- 'Brick:Portal:Object:Form:Message:ObjectSaved' => '已保存 %1$s~~',
+ 'Brick:Portal:Object:Form:Message:ObjectSaved' => '已保存 %1$s',
'Brick:Portal:Object:Search:Regular:Title' => '选择 %1$s (%2$s)',
'Brick:Portal:Object:Search:Hierarchy:Title' => '选择 %1$s (%2$s)',
'Brick:Portal:Object:Copy:TextToCopy' => '%1$s: %2$s',
diff --git a/datamodels/2.x/itop-portal/dictionaries/hu.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/hu.dict.itop-portal.php
index 4d3793418..af7dd3b61 100644
--- a/datamodels/2.x/itop-portal/dictionaries/hu.dict.itop-portal.php
+++ b/datamodels/2.x/itop-portal/dictionaries/hu.dict.itop-portal.php
@@ -32,7 +32,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Page:DefaultTitle' => '%1$s - Felhasználói portál',
'Brick:Portal:UserProfile:Title' => 'Saját profil',
'Brick:Portal:NewRequest:Title' => 'Új kérelem',
- 'Brick:Portal:NewRequest:Title+' => 'Segíthetünk?
Válasszon a szolgáltatáskatalógusból, és küldje el kérését a támogató csapatunknak.
~~',
+ 'Brick:Portal:NewRequest:Title+' => 'Segíthetünk?
Válasszon a szolgáltatáskatalógusból, és küldje el kérését a támogató csapatunknak.
',
'Brick:Portal:OngoingRequests:Title' => 'Folyamatban lévő kérelmek',
'Brick:Portal:OngoingRequests:Title+' => 'Kövesse nyomon a folyamatban lévő kérelmeit.
Kövesse a folyamatot, tegyen megjegyzéseket, csatoljon dokumentumokat, nyugtázza a megoldást.
',
'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Nyitott',
diff --git a/datamodels/2.x/itop-problem-mgmt/dictionaries/hu.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/hu.dict.itop-problem-mgmt.php
index 148833fef..713737fa8 100644
--- a/datamodels/2.x/itop-problem-mgmt/dictionaries/hu.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/dictionaries/hu.dict.itop-problem-mgmt.php
@@ -87,7 +87,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:Problem/Attribute:urgency/Value:3' => 'Sürgős',
'Class:Problem/Attribute:urgency/Value:3+' => '',
'Class:Problem/Attribute:urgency/Value:4' => 'Nem sürgős',
- 'Class:Problem/Attribute:urgency/Value:4+' => 'low~~',
+ 'Class:Problem/Attribute:urgency/Value:4+' => '',
'Class:Problem/Attribute:priority' => 'Prioritás',
'Class:Problem/Attribute:priority+' => '',
'Class:Problem/Attribute:priority/Value:1' => 'Kritikus',
@@ -97,7 +97,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:Problem/Attribute:priority/Value:3' => 'Közepes',
'Class:Problem/Attribute:priority/Value:3+' => '',
'Class:Problem/Attribute:priority/Value:4' => 'Alacsony',
- 'Class:Problem/Attribute:priority/Value:4+' => 'Low~~',
+ 'Class:Problem/Attribute:priority/Value:4+' => '',
'Class:Problem/Attribute:related_change_id' => 'Kapcsolódó változások',
'Class:Problem/Attribute:related_change_id+' => '',
'Class:Problem/Attribute:related_change_ref' => 'Referenciaszám',
diff --git a/datamodels/2.x/itop-problem-mgmt/dictionaries/sk.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/sk.dict.itop-problem-mgmt.php
index b0f7a776a..f8c9d1de9 100644
--- a/datamodels/2.x/itop-problem-mgmt/dictionaries/sk.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/dictionaries/sk.dict.itop-problem-mgmt.php
@@ -43,8 +43,8 @@
// Class:/Stimulus:
// Class:/Stimulus:+
Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
- 'Menu:ProblemManagement' => 'Problem Management~~',
- 'Menu:ProblemManagement+' => 'Problem Management~~',
+ 'Menu:ProblemManagement' => 'Problem management~~',
+ 'Menu:ProblemManagement+' => 'Problem management~~',
'Menu:Problem:Overview' => 'Overview~~',
'Menu:Problem:Overview+' => 'Overview~~',
'Menu:NewProblem' => 'New problem~~',
@@ -103,24 +103,24 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:Problem/Attribute:impact/Value:3+' => '~~',
'Class:Problem/Attribute:urgency' => 'Urgency~~',
'Class:Problem/Attribute:urgency+' => '~~',
- 'Class:Problem/Attribute:urgency/Value:1' => 'critical~~',
- 'Class:Problem/Attribute:urgency/Value:1+' => 'critical~~',
- 'Class:Problem/Attribute:urgency/Value:2' => 'high~~',
- 'Class:Problem/Attribute:urgency/Value:2+' => 'high~~',
- 'Class:Problem/Attribute:urgency/Value:3' => 'medium~~',
- 'Class:Problem/Attribute:urgency/Value:3+' => 'medium~~',
- 'Class:Problem/Attribute:urgency/Value:4' => 'low~~',
- 'Class:Problem/Attribute:urgency/Value:4+' => 'low~~',
+ 'Class:Problem/Attribute:urgency/Value:1' => 'Critical~~',
+ 'Class:Problem/Attribute:urgency/Value:1+' => '',
+ 'Class:Problem/Attribute:urgency/Value:2' => 'High~~',
+ 'Class:Problem/Attribute:urgency/Value:2+' => '',
+ 'Class:Problem/Attribute:urgency/Value:3' => 'Medium~~',
+ 'Class:Problem/Attribute:urgency/Value:3+' => '',
+ 'Class:Problem/Attribute:urgency/Value:4' => 'Low~~',
+ 'Class:Problem/Attribute:urgency/Value:4+' => '',
'Class:Problem/Attribute:priority' => 'Priority~~',
'Class:Problem/Attribute:priority+' => '~~',
'Class:Problem/Attribute:priority/Value:1' => 'Critical~~',
- 'Class:Problem/Attribute:priority/Value:1+' => 'Critical~~',
+ 'Class:Problem/Attribute:priority/Value:1+' => '',
'Class:Problem/Attribute:priority/Value:2' => 'High~~',
- 'Class:Problem/Attribute:priority/Value:2+' => 'High~~',
+ 'Class:Problem/Attribute:priority/Value:2+' => '',
'Class:Problem/Attribute:priority/Value:3' => 'Medium~~',
- 'Class:Problem/Attribute:priority/Value:3+' => 'Medium~~',
+ 'Class:Problem/Attribute:priority/Value:3+' => '',
'Class:Problem/Attribute:priority/Value:4' => 'Low~~',
- 'Class:Problem/Attribute:priority/Value:4+' => 'Low~~',
+ 'Class:Problem/Attribute:priority/Value:4+' => '',
'Class:Problem/Attribute:related_change_id' => 'Related Change~~',
'Class:Problem/Attribute:related_change_id+' => '~~',
'Class:Problem/Attribute:related_change_ref' => 'Related Change ref~~',
diff --git a/datamodels/2.x/itop-problem-mgmt/dictionaries/tr.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/tr.dict.itop-problem-mgmt.php
index 4a3fb5846..83ba82e56 100644
--- a/datamodels/2.x/itop-problem-mgmt/dictionaries/tr.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/dictionaries/tr.dict.itop-problem-mgmt.php
@@ -106,7 +106,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:Problem/Attribute:urgency' => 'Aciliyeti',
'Class:Problem/Attribute:urgency+' => '',
'Class:Problem/Attribute:urgency/Value:1' => 'Critical~~',
- 'Class:Problem/Attribute:urgency/Value:1+' => 'Critical~~',
+ 'Class:Problem/Attribute:urgency/Value:1+' => '',
'Class:Problem/Attribute:urgency/Value:2' => 'Orta',
'Class:Problem/Attribute:urgency/Value:2+' => 'Orta',
'Class:Problem/Attribute:urgency/Value:3' => 'Yüksek',
diff --git a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/tr.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/tr.dict.itop-request-mgmt-itil.php
index 4542b86fa..c89857dd2 100644
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/tr.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/tr.dict.itop-request-mgmt-itil.php
@@ -5,13 +5,13 @@
*/
Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Menu:RequestManagement' => 'Helpdesk~~',
- 'Menu:RequestManagement+' => 'Helpdesk~~',
+ 'Menu:RequestManagement+' => '',
'Menu:RequestManagementProvider' => 'Helpdesk provider~~',
- 'Menu:RequestManagementProvider+' => 'Helpdesk provider~~',
+ 'Menu:RequestManagementProvider+' => '',
'Menu:UserRequest:Provider' => 'Open request transfered to provider~~',
- 'Menu:UserRequest:Provider+' => 'Open request transfered to provider~~',
+ 'Menu:UserRequest:Provider+' => '',
'Menu:UserRequest:Overview' => 'Overview~~',
- 'Menu:UserRequest:Overview+' => 'Overview~~',
+ 'Menu:UserRequest:Overview+' => '',
'Menu:NewUserRequest' => 'New user request~~',
'Menu:NewUserRequest+' => 'Create a new user request ticket~~',
'Menu:SearchUserRequests' => 'Search for user requests~~',
@@ -21,11 +21,11 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Menu:UserRequest:MyRequests' => 'Requests assigned to me~~',
'Menu:UserRequest:MyRequests+' => 'Requests assigned to me (as Agent)~~',
'Menu:UserRequest:MySupportRequests' => 'My support calls~~',
- 'Menu:UserRequest:MySupportRequests+' => 'My support calls~~',
+ 'Menu:UserRequest:MySupportRequests+' => '',
'Menu:UserRequest:EscalatedRequests' => 'Hot Requests~~',
- 'Menu:UserRequest:EscalatedRequests+' => 'Hot Requests~~',
+ 'Menu:UserRequest:EscalatedRequests+' => '',
'Menu:UserRequest:OpenRequests' => 'All open requests~~',
- 'Menu:UserRequest:OpenRequests+' => 'All open requests~~',
+ 'Menu:UserRequest:OpenRequests+' => '',
'UI:WelcomeMenu:MyAssignedCalls' => 'Requests assigned to me~~',
'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Last 14 days request per type~~',
'UI-RequestManagementOverview-Last-14-days' => 'Last 14 days number of requests~~',
@@ -79,7 +79,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:UserRequest/Attribute:request_type' => 'Request Type~~',
'Class:UserRequest/Attribute:request_type+' => '~~',
'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Service request~~',
- 'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Service request~~',
+ 'Class:UserRequest/Attribute:request_type/Value:service_request+' => '',
'Class:UserRequest/Attribute:impact' => 'Impact~~',
'Class:UserRequest/Attribute:impact+' => '~~',
'Class:UserRequest/Attribute:impact/Value:1' => 'A department~~',
@@ -90,38 +90,38 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:UserRequest/Attribute:impact/Value:3+' => '~~',
'Class:UserRequest/Attribute:priority' => 'Priority~~',
'Class:UserRequest/Attribute:priority+' => '~~',
- 'Class:UserRequest/Attribute:priority/Value:1' => 'critical~~',
- 'Class:UserRequest/Attribute:priority/Value:1+' => 'critical~~',
- 'Class:UserRequest/Attribute:priority/Value:2' => 'high~~',
- 'Class:UserRequest/Attribute:priority/Value:2+' => 'high~~',
- 'Class:UserRequest/Attribute:priority/Value:3' => 'medium~~',
- 'Class:UserRequest/Attribute:priority/Value:3+' => 'medium~~',
- 'Class:UserRequest/Attribute:priority/Value:4' => 'low~~',
- 'Class:UserRequest/Attribute:priority/Value:4+' => 'low~~',
+ 'Class:UserRequest/Attribute:priority/Value:1' => 'Critical~~',
+ 'Class:UserRequest/Attribute:priority/Value:1+' => '',
+ 'Class:UserRequest/Attribute:priority/Value:2' => 'High~~',
+ 'Class:UserRequest/Attribute:priority/Value:2+' => '',
+ 'Class:UserRequest/Attribute:priority/Value:3' => 'Medium~~',
+ 'Class:UserRequest/Attribute:priority/Value:3+' => '',
+ 'Class:UserRequest/Attribute:priority/Value:4' => 'Low~~',
+ 'Class:UserRequest/Attribute:priority/Value:4+' => '',
'Class:UserRequest/Attribute:urgency' => 'Urgency~~',
'Class:UserRequest/Attribute:urgency+' => '~~',
- 'Class:UserRequest/Attribute:urgency/Value:1' => 'critical~~',
- 'Class:UserRequest/Attribute:urgency/Value:1+' => 'critical~~',
- 'Class:UserRequest/Attribute:urgency/Value:2' => 'high~~',
- 'Class:UserRequest/Attribute:urgency/Value:2+' => 'high~~',
- 'Class:UserRequest/Attribute:urgency/Value:3' => 'medium~~',
- 'Class:UserRequest/Attribute:urgency/Value:3+' => 'medium~~',
- 'Class:UserRequest/Attribute:urgency/Value:4' => 'low~~',
- 'Class:UserRequest/Attribute:urgency/Value:4+' => 'low~~',
+ 'Class:UserRequest/Attribute:urgency/Value:1' => 'Critical~~',
+ 'Class:UserRequest/Attribute:urgency/Value:1+' => '',
+ 'Class:UserRequest/Attribute:urgency/Value:2' => 'High~~',
+ 'Class:UserRequest/Attribute:urgency/Value:2+' => '',
+ 'Class:UserRequest/Attribute:urgency/Value:3' => 'Medium~~',
+ 'Class:UserRequest/Attribute:urgency/Value:3+' => '',
+ 'Class:UserRequest/Attribute:urgency/Value:4' => 'Low~~',
+ 'Class:UserRequest/Attribute:urgency/Value:4+' => '',
'Class:UserRequest/Attribute:origin' => 'Origin~~',
'Class:UserRequest/Attribute:origin+' => '~~',
'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
- 'Class:UserRequest/Attribute:origin/Value:mail' => 'email~~',
- 'Class:UserRequest/Attribute:origin/Value:mail+' => 'email~~',
- 'Class:UserRequest/Attribute:origin/Value:monitoring' => 'monitoring~~',
- 'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'monitoring~~',
- 'Class:UserRequest/Attribute:origin/Value:phone' => 'phone~~',
- 'Class:UserRequest/Attribute:origin/Value:phone+' => 'phone~~',
- 'Class:UserRequest/Attribute:origin/Value:portal' => 'portal~~',
- 'Class:UserRequest/Attribute:origin/Value:portal+' => 'portal~~',
+ 'Class:UserRequest/Attribute:origin/Value:mail' => 'Email~~',
+ 'Class:UserRequest/Attribute:origin/Value:mail+' => 'Request created on an email reception~~',
+ 'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitoring~~',
+ 'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'Request created on a monitoring alert~~',
+ 'Class:UserRequest/Attribute:origin/Value:phone' => 'Phone~~',
+ 'Class:UserRequest/Attribute:origin/Value:phone+' => 'Request created following a phone call~~',
+ 'Class:UserRequest/Attribute:origin/Value:portal' => 'Portal~~',
+ 'Class:UserRequest/Attribute:origin/Value:portal+' => 'Request created on the user portal~~',
'Class:UserRequest/Attribute:approver_id' => 'Approver~~',
'Class:UserRequest/Attribute:approver_id+' => '~~',
'Class:UserRequest/Attribute:approver_email' => 'Approver Email~~',
@@ -137,9 +137,9 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:UserRequest/Attribute:escalation_flag' => 'Hot Flag~~',
'Class:UserRequest/Attribute:escalation_flag+' => '~~',
'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'No~~',
- 'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'No~~',
+ 'Class:UserRequest/Attribute:escalation_flag/Value:no+' => '',
'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Yes~~',
- 'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Yes~~',
+ 'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => '',
'Class:UserRequest/Attribute:escalation_reason' => 'Hot reason~~',
'Class:UserRequest/Attribute:escalation_reason+' => '~~',
'Class:UserRequest/Attribute:assignment_date' => 'Assignment date~~',
@@ -170,20 +170,20 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:UserRequest/Attribute:time_spent+' => '~~',
'Class:UserRequest/Attribute:resolution_code' => 'Resolution code~~',
'Class:UserRequest/Attribute:resolution_code+' => '~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'assistance~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'assistance~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'bug fixed~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'hardware repair~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:other' => 'other~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'other~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'software patch~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'software patch~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'system update~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'system update~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:training' => 'training~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'training~~',
+ 'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'Assistance~~',
+ 'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => '',
+ 'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'Bug fixed~~',
+ 'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => '',
+ 'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'Hardware repair~~',
+ 'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => '',
+ 'Class:UserRequest/Attribute:resolution_code/Value:other' => 'Other~~',
+ 'Class:UserRequest/Attribute:resolution_code/Value:other+' => '',
+ 'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'Software patch~~',
+ 'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => '',
+ 'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'System update~~',
+ 'Class:UserRequest/Attribute:resolution_code/Value:system update+' => '',
+ 'Class:UserRequest/Attribute:resolution_code/Value:training' => 'Training~~',
+ 'Class:UserRequest/Attribute:resolution_code/Value:training+' => '',
'Class:UserRequest/Attribute:solution' => 'Solution~~',
'Class:UserRequest/Attribute:solution+' => '~~',
'Class:UserRequest/Attribute:pending_reason' => 'Pending reason~~',
@@ -211,13 +211,13 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:UserRequest/Attribute:user_satisfaction' => 'User satisfaction~~',
'Class:UserRequest/Attribute:user_satisfaction+' => '~~',
'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Very satisfied~~',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Very satisfied~~',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Fairly statisfied~~',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Fairly statisfied~~',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Rather Dissatified~~',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Rather Dissatified~~',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Very Dissatisfied~~',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Very Dissatisfied~~',
+ 'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => '',
+ 'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Fairly satisfied~~',
+ 'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => '',
+ 'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Rather dissatified~~',
+ 'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => '',
+ 'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Very dissatified~~',
+ 'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => '',
'Class:UserRequest/Attribute:user_comment' => 'User comment~~',
'Class:UserRequest/Attribute:user_comment+' => '~~',
'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname~~',
diff --git a/datamodels/2.x/itop-request-mgmt/dictionaries/hu.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/hu.dict.itop-request-mgmt.php
index fa8a3cfda..81da0e475 100644
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/hu.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/hu.dict.itop-request-mgmt.php
@@ -7,9 +7,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Menu:RequestManagement' => 'Helpdesk',
'Menu:RequestManagement+' => 'Kérelmek kezelése',
'Menu:RequestManagementProvider' => 'Helpdesk szolgáltató',
- 'Menu:RequestManagementProvider+' => 'Helpdesk provider~~',
+ 'Menu:RequestManagementProvider+' => '',
'Menu:UserRequest:Provider' => 'Szolgáltatónak átadott nyitott kérelmek',
- 'Menu:UserRequest:Provider+' => 'Open requests transfered to provider~~',
+ 'Menu:UserRequest:Provider+' => '',
'Menu:UserRequest:Overview' => 'Áttekintő',
'Menu:UserRequest:Overview+' => 'Áttekintő oldal',
'Menu:NewUserRequest' => 'Új felhasználói kérelem',
diff --git a/datamodels/2.x/itop-request-mgmt/dictionaries/tr.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/tr.dict.itop-request-mgmt.php
index 7e7d6f6d8..dc5cc60ac 100644
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/tr.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/tr.dict.itop-request-mgmt.php
@@ -5,13 +5,13 @@
*/
Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Menu:RequestManagement' => 'Helpdesk~~',
- 'Menu:RequestManagement+' => 'Helpdesk~~',
+ 'Menu:RequestManagement+' => '',
'Menu:RequestManagementProvider' => 'Helpdesk provider~~',
- 'Menu:RequestManagementProvider+' => 'Helpdesk provider~~',
+ 'Menu:RequestManagementProvider+' => '',
'Menu:UserRequest:Provider' => 'Open requests transfered to provider~~',
- 'Menu:UserRequest:Provider+' => 'Open requests transfered to provider~~',
+ 'Menu:UserRequest:Provider+' => '',
'Menu:UserRequest:Overview' => 'Overview~~',
- 'Menu:UserRequest:Overview+' => 'Overview~~',
+ 'Menu:UserRequest:Overview+' => '',
'Menu:NewUserRequest' => 'New user request~~',
'Menu:NewUserRequest+' => 'Create a new user request ticket~~',
'Menu:SearchUserRequests' => 'Search for user requests~~',
@@ -21,11 +21,11 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Menu:UserRequest:MyRequests' => 'Requests assigned to me~~',
'Menu:UserRequest:MyRequests+' => 'Requests assigned to me (as Agent)~~',
'Menu:UserRequest:MySupportRequests' => 'My support calls~~',
- 'Menu:UserRequest:MySupportRequests+' => 'My support calls~~',
+ 'Menu:UserRequest:MySupportRequests+' => '',
'Menu:UserRequest:EscalatedRequests' => 'Hot requests~~',
- 'Menu:UserRequest:EscalatedRequests+' => 'Hot requests~~',
+ 'Menu:UserRequest:EscalatedRequests+' => '',
'Menu:UserRequest:OpenRequests' => 'All open requests~~',
- 'Menu:UserRequest:OpenRequests+' => 'All open requests~~',
+ 'Menu:UserRequest:OpenRequests+' => '',
'UI:WelcomeMenu:MyAssignedCalls' => 'Requests assigned to me~~',
'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Requests of the last 14 days (per type)~~',
'UI-RequestManagementOverview-Last-14-days' => 'Requests of the last 14 days (per day)~~',
@@ -83,9 +83,9 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:UserRequest/Attribute:request_type' => 'Request Type~~',
'Class:UserRequest/Attribute:request_type+' => '~~',
'Class:UserRequest/Attribute:request_type/Value:incident' => 'Incident~~',
- 'Class:UserRequest/Attribute:request_type/Value:incident+' => 'Incident~~',
+ 'Class:UserRequest/Attribute:request_type/Value:incident+' => '',
'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Service request~~',
- 'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Service request~~',
+ 'Class:UserRequest/Attribute:request_type/Value:service_request+' => '',
'Class:UserRequest/Attribute:impact' => 'Impact~~',
'Class:UserRequest/Attribute:impact+' => '~~',
'Class:UserRequest/Attribute:impact/Value:1' => 'A department~~',
@@ -96,38 +96,38 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:UserRequest/Attribute:impact/Value:3+' => '~~',
'Class:UserRequest/Attribute:priority' => 'Priority~~',
'Class:UserRequest/Attribute:priority+' => '~~',
- 'Class:UserRequest/Attribute:priority/Value:1' => 'critical~~',
- 'Class:UserRequest/Attribute:priority/Value:1+' => 'critical~~',
- 'Class:UserRequest/Attribute:priority/Value:2' => 'high~~',
- 'Class:UserRequest/Attribute:priority/Value:2+' => 'high~~',
- 'Class:UserRequest/Attribute:priority/Value:3' => 'medium~~',
- 'Class:UserRequest/Attribute:priority/Value:3+' => 'medium~~',
- 'Class:UserRequest/Attribute:priority/Value:4' => 'low~~',
- 'Class:UserRequest/Attribute:priority/Value:4+' => 'low~~',
+ 'Class:UserRequest/Attribute:priority/Value:1' => 'Critical~~',
+ 'Class:UserRequest/Attribute:priority/Value:1+' => 'Highest priority~~',
+ 'Class:UserRequest/Attribute:priority/Value:2' => 'High~~',
+ 'Class:UserRequest/Attribute:priority/Value:2+' => '',
+ 'Class:UserRequest/Attribute:priority/Value:3' => 'Medium~~',
+ 'Class:UserRequest/Attribute:priority/Value:3+' => '',
+ 'Class:UserRequest/Attribute:priority/Value:4' => 'Low~~',
+ 'Class:UserRequest/Attribute:priority/Value:4+' => 'Lowest priority~~',
'Class:UserRequest/Attribute:urgency' => 'Urgency~~',
'Class:UserRequest/Attribute:urgency+' => '~~',
- 'Class:UserRequest/Attribute:urgency/Value:1' => 'critical~~',
- 'Class:UserRequest/Attribute:urgency/Value:1+' => 'critical~~',
- 'Class:UserRequest/Attribute:urgency/Value:2' => 'high~~',
- 'Class:UserRequest/Attribute:urgency/Value:2+' => 'high~~',
- 'Class:UserRequest/Attribute:urgency/Value:3' => 'medium~~',
- 'Class:UserRequest/Attribute:urgency/Value:3+' => 'medium~~',
- 'Class:UserRequest/Attribute:urgency/Value:4' => 'low~~',
- 'Class:UserRequest/Attribute:urgency/Value:4+' => 'low~~',
+ 'Class:UserRequest/Attribute:urgency/Value:1' => 'Critical~~',
+ 'Class:UserRequest/Attribute:urgency/Value:1+' => 'Most urgent~~',
+ 'Class:UserRequest/Attribute:urgency/Value:2' => 'High~~',
+ 'Class:UserRequest/Attribute:urgency/Value:2+' => '',
+ 'Class:UserRequest/Attribute:urgency/Value:3' => 'Medium~~',
+ 'Class:UserRequest/Attribute:urgency/Value:3+' => '',
+ 'Class:UserRequest/Attribute:urgency/Value:4' => 'Low~~',
+ 'Class:UserRequest/Attribute:urgency/Value:4+' => 'Lowest urgency level~~',
'Class:UserRequest/Attribute:origin' => 'Origin~~',
'Class:UserRequest/Attribute:origin+' => '~~',
'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
- 'Class:UserRequest/Attribute:origin/Value:mail' => 'email~~',
- 'Class:UserRequest/Attribute:origin/Value:mail+' => 'email~~',
- 'Class:UserRequest/Attribute:origin/Value:monitoring' => 'monitoring~~',
- 'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'monitoring~~',
- 'Class:UserRequest/Attribute:origin/Value:phone' => 'phone~~',
- 'Class:UserRequest/Attribute:origin/Value:phone+' => 'phone~~',
- 'Class:UserRequest/Attribute:origin/Value:portal' => 'portal~~',
- 'Class:UserRequest/Attribute:origin/Value:portal+' => 'portal~~',
+ 'Class:UserRequest/Attribute:origin/Value:mail' => 'Email~~',
+ 'Class:UserRequest/Attribute:origin/Value:mail+' => 'Request created on an email reception~~',
+ 'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitoring~~',
+ 'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'Request created on a monitoring alert~~',
+ 'Class:UserRequest/Attribute:origin/Value:phone' => 'Phone~~',
+ 'Class:UserRequest/Attribute:origin/Value:phone+' => 'Request created following a phone call~~',
+ 'Class:UserRequest/Attribute:origin/Value:portal' => 'Portal~~',
+ 'Class:UserRequest/Attribute:origin/Value:portal+' => 'Request created on the user portal~~',
'Class:UserRequest/Attribute:approver_id' => 'Approver~~',
'Class:UserRequest/Attribute:approver_id+' => '~~',
'Class:UserRequest/Attribute:approver_email' => 'Approver Email~~',
@@ -143,9 +143,9 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:UserRequest/Attribute:escalation_flag' => 'Hot Flag~~',
'Class:UserRequest/Attribute:escalation_flag+' => '~~',
'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'No~~',
- 'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'No~~',
+ 'Class:UserRequest/Attribute:escalation_flag/Value:no+' => '~~',
'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Yes~~',
- 'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Yes~~',
+ 'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => '',
'Class:UserRequest/Attribute:escalation_reason' => 'Hot reason~~',
'Class:UserRequest/Attribute:escalation_reason+' => '~~',
'Class:UserRequest/Attribute:assignment_date' => 'Assignment date~~',
@@ -154,7 +154,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:UserRequest/Attribute:resolution_date+' => '~~',
'Class:UserRequest/Attribute:last_pending_date' => 'Last pending date~~',
'Class:UserRequest/Attribute:last_pending_date+' => '~~',
- 'Class:UserRequest/Attribute:cumulatedpending' => 'cumulatedpending~~',
+ 'Class:UserRequest/Attribute:cumulatedpending' => 'cumulated pending~~',
'Class:UserRequest/Attribute:cumulatedpending+' => '~~',
'Class:UserRequest/Attribute:tto' => 'TTO~~',
'Class:UserRequest/Attribute:tto+' => '~~',
@@ -176,20 +176,20 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:UserRequest/Attribute:time_spent+' => '~~',
'Class:UserRequest/Attribute:resolution_code' => 'Resolution code~~',
'Class:UserRequest/Attribute:resolution_code+' => '~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'assistance~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'assistance~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'bug fixed~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'hardware repair~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:other' => 'other~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'other~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'software patch~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'software patch~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'system update~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'system update~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:training' => 'training~~',
- 'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'training~~',
+ 'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'Assistance~~',
+ 'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => '',
+ 'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'Bug fixed~~',
+ 'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => '',
+ 'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'Hardware repair~~',
+ 'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => '',
+ 'Class:UserRequest/Attribute:resolution_code/Value:other' => 'Other~~',
+ 'Class:UserRequest/Attribute:resolution_code/Value:other+' => '',
+ 'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'Software patch~~',
+ 'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => '',
+ 'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'System update~~',
+ 'Class:UserRequest/Attribute:resolution_code/Value:system update+' => '',
+ 'Class:UserRequest/Attribute:resolution_code/Value:training' => 'Training~~',
+ 'Class:UserRequest/Attribute:resolution_code/Value:training+' => '',
'Class:UserRequest/Attribute:solution' => 'Solution~~',
'Class:UserRequest/Attribute:solution+' => '~~',
'Class:UserRequest/Attribute:pending_reason' => 'Pending reason~~',
@@ -213,13 +213,13 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:UserRequest/Attribute:user_satisfaction' => 'User satisfaction~~',
'Class:UserRequest/Attribute:user_satisfaction+' => '~~',
'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Very satisfied~~',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Very satisfied~~',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Fairly statisfied~~',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Fairly statisfied~~',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Rather Dissatified~~',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Rather Dissatified~~',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Very Dissatisfied~~',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Very Dissatisfied~~',
+ 'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => '',
+ 'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Fairly satisfied~~',
+ 'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => '',
+ 'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Rather dissatified~~',
+ 'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => '',
+ 'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Very dissatified~~',
+ 'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => '',
'Class:UserRequest/Attribute:user_comment' => 'User comment~~',
'Class:UserRequest/Attribute:user_comment+' => '~~',
'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname~~',
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/da.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/da.dict.itop-service-mgmt-provider.php
index 839e71d4f..70453a44d 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/da.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/da.dict.itop-service-mgmt-provider.php
@@ -161,7 +161,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:ProviderContract' => 'Leverandørkontrakt',
'Class:ProviderContract+' => '',
'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
- 'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this provider contract~~',
+ 'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this contract~~',
'Class:ProviderContract/Attribute:sla' => 'SLA',
'Class:ProviderContract/Attribute:sla+' => '',
'Class:ProviderContract/Attribute:coverage' => 'Servicetider',
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/ja.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/ja.dict.itop-service-mgmt-provider.php
index bb5067615..70843482e 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/ja.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/ja.dict.itop-service-mgmt-provider.php
@@ -160,7 +160,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:ProviderContract' => 'プロバイダー契約',
'Class:ProviderContract+' => '',
'Class:ProviderContract/Attribute:functionalcis_list' => 'CI',
- 'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this provider contract~~',
+ 'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this contract~~',
'Class:ProviderContract/Attribute:sla' => 'SLA',
'Class:ProviderContract/Attribute:sla+' => '',
'Class:ProviderContract/Attribute:coverage' => 'サービス時間帯',
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/sk.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/sk.dict.itop-service-mgmt-provider.php
index 771d2d293..603dff516 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/sk.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/sk.dict.itop-service-mgmt-provider.php
@@ -170,7 +170,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:ProviderContract' => 'Poskytovateľská zmluva',
'Class:ProviderContract+' => '',
'Class:ProviderContract/Attribute:functionalcis_list' => 'Zariadenia',
- 'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this provider contract~~',
+ 'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this contract~~',
'Class:ProviderContract/Attribute:sla' => 'SLA',
'Class:ProviderContract/Attribute:sla+' => '',
'Class:ProviderContract/Attribute:coverage' => 'Časy pokrytia',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
index e204cba3d..9e8479cd7 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
@@ -338,7 +338,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:SLA/Attribute:slts_list' => 'SLTs',
'Class:SLA/Attribute:slts_list+' => 'Service Level Threshholds:',
'Class:SLA/Attribute:customercontracts_list' => 'Kunde kontrakter',
- 'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
+ 'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracted services using this SLA~~',
'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Could not save link with Customer contract %1$s and service %2$s : SLA already exists~~',
));
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
index 460f140d4..8e05d1b73 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
@@ -348,7 +348,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:SLA/Attribute:slts_list' => 'SLTs~~',
'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
'Class:SLA/Attribute:customercontracts_list' => 'Customer contracts~~',
- 'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
+ 'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracted services using this SLA~~',
'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Could not save link with Customer contract %1$s and service %2$s : SLA already exists~~',
));
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
index a3462abb8..db60c6108 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
@@ -337,7 +337,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:SLA/Attribute:slts_list' => 'SLT',
'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
'Class:SLA/Attribute:customercontracts_list' => '顧客連絡先',
- 'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
+ 'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracted services using this SLA~~',
'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Could not save link with Customer contract %1$s and service %2$s : SLA already exists~~',
));
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php
index 4f466cd60..d42281629 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php
@@ -347,7 +347,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:SLA/Attribute:slts_list' => 'SLTs',
'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
'Class:SLA/Attribute:customercontracts_list' => 'Zákaznícke zmluvy',
- 'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
+ 'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracted services using this SLA~~',
'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Could not save link with Customer contract %1$s and service %2$s : SLA already exists~~',
));
diff --git a/datamodels/2.x/itop-structure/dictionaries/it.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/it.dict.itop-structure.php
index 74325451f..f5426c13c 100644
--- a/datamodels/2.x/itop-structure/dictionaries/it.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/dictionaries/it.dict.itop-structure.php
@@ -217,7 +217,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:Document/Attribute:status/Value:published+' => '',
'Class:Document/Attribute:cis_list' => 'CIs~~',
'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
- 'Class:Document/Attribute:finalclass' => 'Document Type~~',
+ 'Class:Document/Attribute:finalclass' => 'Document sub-class~~',
'Class:Document/Attribute:finalclass+' => 'Name of the final class~~',
));
@@ -263,7 +263,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:Typology+' => '~~',
'Class:Typology/Attribute:name' => 'Name~~',
'Class:Typology/Attribute:name+' => '~~',
- 'Class:Typology/Attribute:finalclass' => 'Type~~',
+ 'Class:Typology/Attribute:finalclass' => 'Typology sub-class~~',
'Class:Typology/Attribute:finalclass+' => 'Name of the final class~~',
));
diff --git a/datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php
index 25e23257a..987962fbc 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php
@@ -175,7 +175,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field~~',
'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson~~',
- 'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the \\"person\\" attached to the logged in \\"user\\").~~',
+ 'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the "person" attached to the logged in "user").~~',
'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Target Field~~',
'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime~~',
@@ -185,7 +185,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field~~',
'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date~~',
'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours~~',
- 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to \\"DefaultWorkingTimeComputer\\" to force a 24x7 scheme~~',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to "DefaultWorkingTimeComputer" to force a 24x7 scheme~~',
'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull~~',
'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Set a field only if it is empty, with a static value~~',
'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Target Field~~',
diff --git a/datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
index cafe12740..1264171c0 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
@@ -174,7 +174,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Célmező',
'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson',
- 'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the \\"person\\" attached to the logged in \\"user\\").~~',
+ 'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the "person" attached to the logged in "user").~~',
'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Célmező',
'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime',
@@ -184,7 +184,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Referencia mező',
'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date~~',
'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Munkaórák',
- 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to \\"DefaultWorkingTimeComputer\\" to force a 24x7 scheme~~',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to "DefaultWorkingTimeComputer" to force a 24x7 scheme~~',
'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull',
'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Set a field only if it is empty, with a static value~~',
'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Célmező',
diff --git a/datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php
index 9ed07ca54..f341d7c2d 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php
@@ -57,7 +57,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:Ticket/Attribute:contacts_list' => 'Contacts~~',
'Class:Ticket/Attribute:contacts_list+' => 'All the contacts linked to this ticket~~',
'Class:Ticket/Attribute:functionalcis_list' => 'CIs~~',
- 'Class:Ticket/Attribute:functionalcis_list+' => 'All the configuration items impacted for this ticket~~',
+ 'Class:Ticket/Attribute:functionalcis_list+' => 'All the configuration items impacted by this ticket. Items marked as "Computed" have been automatically marked as impacted. Items marked as "Not impacted" are excluded from the impact.~~',
'Class:Ticket/Attribute:workorders_list' => 'Work orders~~',
'Class:Ticket/Attribute:workorders_list+' => 'All the work orders for this ticket~~',
'Class:Ticket/Attribute:finalclass' => 'Tipo',
@@ -174,7 +174,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field~~',
'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson~~',
- 'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the \\"person\\" attached to the logged in \\"user\\").~~',
+ 'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the "person" attached to the logged in "user").~~',
'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Target Field~~',
'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime~~',
@@ -184,7 +184,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field~~',
'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date~~',
'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours~~',
- 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to \\"DefaultWorkingTimeComputer\\" to force a 24x7 scheme~~',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to "DefaultWorkingTimeComputer" to force a 24x7 scheme~~',
'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull~~',
'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Set a field only if it is empty, with a static value~~',
'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Target Field~~',
diff --git a/datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php
index c33025f12..a5969144e 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php
@@ -174,7 +174,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field~~',
'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson~~',
- 'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the \\"person\\" attached to the logged in \\"user\\").~~',
+ 'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the "person" attached to the logged in "user").~~',
'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Target Field~~',
'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime~~',
@@ -184,7 +184,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field~~',
'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date~~',
'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours~~',
- 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to \\"DefaultWorkingTimeComputer\\" to force a 24x7 scheme~~',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to "DefaultWorkingTimeComputer" to force a 24x7 scheme~~',
'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull~~',
'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Set a field only if it is empty, with a static value~~',
'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Target Field~~',
diff --git a/dictionaries/cs.dictionary.itop.core.php b/dictionaries/cs.dictionary.itop.core.php
index bf67929c2..682ddd254 100755
--- a/dictionaries/cs.dictionary.itop.core.php
+++ b/dictionaries/cs.dictionary.itop.core.php
@@ -477,20 +477,24 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Class:ActionEmail' => 'Emailové upozornění',
'Class:ActionEmail+' => '',
- 'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified: just the Test recipient, all (To, cc and Bcc) or no-one~~',
+ 'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified:
+- Being tested: just the Test recipient,
+- In production: all (To, cc and Bcc)
+- Inactive: no-one~~',
'Class:ActionEmail/Attribute:status/Value:test+' => 'Only the Test recipient is notified~~',
'Class:ActionEmail/Attribute:status/Value:enabled+' => 'All To, Cc and Bcc emails are notified~~',
'Class:ActionEmail/Attribute:status/Value:disabled+' => 'The email notification will not be sent~~',
'Class:ActionEmail/Attribute:test_recipient' => 'Adresát pro test',
'Class:ActionEmail/Attribute:test_recipient+' => 'Cílová adresa pro případ, kdy je stav nastaven na "Testování"',
- 'Class:ActionEmail/Attribute:from' => 'Odesílatel~~',
+ 'Class:ActionEmail/Attribute:from' => 'Odesílatel',
'Class:ActionEmail/Attribute:from+' => '',
'Class:ActionEmail/Attribute:from_label' => 'From (label)~~',
- 'Class:ActionEmail/Attribute:from_label+' => 'Sender display name will be sent into the email header~~',
- 'Class:ActionEmail/Attribute:reply_to' => 'Odpověď na~~',
+ 'Class:ActionEmail/Attribute:from_label+' => 'Either a static label or a placeholder like $this->agent_id->friendlyname$~~',
+ 'Class:ActionEmail/Attribute:reply_to' => 'Odpověď na',
'Class:ActionEmail/Attribute:reply_to+' => '',
'Class:ActionEmail/Attribute:reply_to_label' => 'Reply to (label)~~',
- 'Class:ActionEmail/Attribute:reply_to_label+' => 'Reply to display name will be sent into the email header~~',
+ 'Class:ActionEmail/Attribute:reply_to_label+' => 'Either a static label or a placeholder like $this->team_id->friendlyname$.
+If omitted the From (label) is used.~~',
'Class:ActionEmail/Attribute:to' => 'To',
'Class:ActionEmail/Attribute:to+' => 'Adresát',
'Class:ActionEmail/Attribute:cc' => 'Cc',
@@ -1013,7 +1017,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code~~',
'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Used tags cannot be deleted~~',
'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Tags codes or labels must be unique~~',
- 'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters~~',
+ 'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters, starting with a letter.~~',
'Core:TagSetFieldData:ErrorTagCodeReservedWord' => 'The chosen tag code is a reserved word~~',
'Core:TagSetFieldData:ErrorTagLabelSyntax' => 'Tags label must not contain \'%1$s\' nor be empty~~',
'Core:TagSetFieldData:ErrorCodeUpdateNotAllowed' => 'Tags Code cannot be changed when used~~',
diff --git a/dictionaries/cs.dictionary.itop.ui.php b/dictionaries/cs.dictionary.itop.ui.php
index 965b5f1b9..c987ea984 100755
--- a/dictionaries/cs.dictionary.itop.ui.php
+++ b/dictionaries/cs.dictionary.itop.ui.php
@@ -367,16 +367,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Class:UserDashboard/Attribute:contents+' => '~~',
));
-//
-// Expression to Natural language
-//
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
- 'Expression:Unit:Short:DAY' => 'd~~',
- 'Expression:Unit:Short:WEEK' => 'w~~',
- 'Expression:Unit:Short:MONTH' => 'm~~',
- 'Expression:Unit:Short:YEAR' => 'y~~',
-));
-
//
// Duplicated into itop-welcome-itil ( will be removed from here...)
//
@@ -450,8 +440,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:WelcomeMenu:MyIncidents' => 'Incidenty přidělené mně',
'UI:AllOrganizations' => ' Všechny organizace ',
'UI:YourSearch' => 'hledat',
- 'UI:LoggedAsMessage' => 'Přihlášen - %1$s (%2$s)~~',
- 'UI:LoggedAsMessage+Admin' => 'Přihlášen - %1$s (%2$s, Administrátor)~~',
+ 'UI:LoggedAsMessage' => 'Přihlášen - %1$s (%2$s)',
+ 'UI:LoggedAsMessage+Admin' => 'Přihlášen - %1$s (%2$s, Administrátor)',
'UI:Button:Logoff' => 'Odhlásit',
'UI:Button:GlobalSearch' => 'Hledat',
'UI:Button:Search' => ' Hledat ',
@@ -498,7 +488,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:InputFile:NoFileSelected' => 'No File Selected~~',
'UI:InputFile:SelectFile' => 'Select a file~~',
'UI:SearchToggle' => 'Hledání',
- 'UI:ClickToCreateNew' => 'Nový objekt (%1$s)~~',
+ 'UI:ClickToCreateNew' => 'Nový objekt (%1$s)',
'UI:SearchFor_Class' => 'Hledat objekty třídy %1$s',
'UI:NoObjectToDisplay' => 'Žádný objekt k zobrazení.',
'UI:Error:SaveFailed' => 'The object cannot be saved :~~',
@@ -565,7 +555,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:Menu:Actions' => 'Akce',
'UI:Menu:OtherActions' => 'Další akce',
'UI:Menu:Transitions' => 'Transitions~~',
- 'UI:Menu:OtherTransitions' => 'Other transitions~~',
+ 'UI:Menu:OtherTransitions' => 'Other Transitions~~',
'UI:Menu:View' => 'View this object~~',
'UI:Menu:New' => 'Nový...',
'UI:Menu:Add' => 'Přidat...',
@@ -709,7 +699,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:UniversalSearch:Error' => 'Chyba: %1$s',
'UI:UniversalSearch:LabelSelectTheClass' => 'Vyberte třídu pro hledání: ',
'UI:CSVReport-Value-Modified' => 'Upraveno',
- 'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
+ 'UI:CSVReport-Value-SetIssue' => 'Invalid value for attribute~~',
'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
@@ -793,7 +783,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:Audit:Dashboard:ObjectsAudited' => 'Objects audited~~',
'UI:Audit:Dashboard:ObjectsInError' => 'Objects in errors~~',
'UI:Audit:Dashboard:ObjectsValidated' => 'Objects validated~~',
- 'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%%~~',
+ 'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%% of the object are valid~~',
'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - Vyhodnocení OQL dotazu',
'UI:RunQuery:QueryExamples' => 'Příklady dotazů',
'UI:RunQuery:QueryResults' => 'Query Results~~',
@@ -814,7 +804,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:Query:UrlForExcel' => 'URL pro MS-Excel web queries',
'UI:Query:UrlV1' => 'Nebyl specifikován seznam sloupců k exportu. Bez této informace nemůže stránka export-V2.php provést export. Pro export všech polí použijte stránku export.php. Pokud však chcete udržet konzistenci v delším časovém horzontu, použijte stávající stránku a specifikujte paramter "fields".',
'UI:Schema:Title' => ITOP_APPLICATION_SHORT.' schéma objektů',
- 'UI:Schema:TitleForClass' => '%1$s schéma~~',
+ 'UI:Schema:TitleForClass' => '%1$s schema~~',
'UI:Schema:CategoryMenuItem' => 'Kategorie %1$s',
'UI:Schema:Relationships' => 'Vztahy',
'UI:Schema:AbstractClass' => 'Abstraktní třída: instance objektu této třídy nemůže být vytvořena.',
@@ -1067,7 +1057,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
Outgoing webhooks: Allow integration with a third-party application by sending structured data to a defined URL.
-Aby mohly být akce spuštěny, musí být přiřazeny ke triggerům. Každá akce pak dostane své "pořadové" číslo, které určí v jakém pořadí se akce spustí.
~~',
+Aby mohly být akce spuštěny, musí být přiřazeny ke triggerům. Každá akce pak dostane své "pořadové" číslo, které určí v jakém pořadí se akce spustí.
',
'UI:NotificationsMenu:Triggers' => 'Triggery',
'UI:NotificationsMenu:AvailableTriggers' => 'Dostupné triggery',
'UI:NotificationsMenu:OnCreate' => 'Při vytvoření objektu',
@@ -1086,8 +1076,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:iTopVersion:Short' => '%1$s verze %2$s',
'UI:iTopVersion:Long' => '%1$s verze %2$s-%3$s ze dne %4$s',
'UI:PropertiesTab' => 'Vlastnosti',
- 'UI:OpenDocumentInNewWindow_' => 'Otevřít~~',
- 'UI:DownloadDocument_' => 'Stáhnout~~',
+ 'UI:OpenDocumentInNewWindow_' => 'Otevřít',
+ 'UI:DownloadDocument_' => 'Stáhnout',
'UI:Document:NoPreview' => 'Pro tento typ dokumentu není k dispozici žádný náhled',
'UI:Download-CSV' => 'Stáhnout %1$s',
'UI:DeadlineMissedBy_duration' => 'Zmeškáno o %1$s',
@@ -1212,10 +1202,10 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
'UI:FavoriteOrganizations' => 'Oblíbené organizace',
'UI:FavoriteOrganizations+' => 'Zaškrtněte, které organizace chcete vidět v rozbalovacím menu pro rychlý přístup. Mějte na paměti, že toto není bezpečnostní opatření. Objekty všech organizací jsou pořád viditelné a přístupné vybráním "Všechny organizace" z rozbalovacího menu.',
- 'UI:FavoriteLanguage' => 'Jazyk uživatelského rozhraní~~',
+ 'UI:FavoriteLanguage' => 'Jazyk uživatelského rozhraní',
'UI:Favorites:SelectYourLanguage' => 'Preferovaný jazyk:',
'UI:FavoriteOtherSettings' => 'Další nastavení',
- 'UI:Favorites:Default_X_ItemsPerPage' => 'Výchozí délka seznamů: %1$s položek na stránku~~',
+ 'UI:Favorites:Default_X_ItemsPerPage' => 'Výchozí délka seznamů: %1$s položek na stránku',
'UI:Favorites:ShowObsoleteData' => 'Show obsolete data~~',
'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
'UI:NavigateAwayConfirmationMessage' => 'Všechny úpravy budou zahozeny.',
@@ -1659,7 +1649,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Menu:UserAccountsMenu' => 'Uživatelské účty',
'Menu:UserAccountsMenu+' => 'Uživatelské účty',
'Menu:UserAccountsMenu:Title' => 'Uživatelské účty',
- 'Menu:UserManagement' => 'User Management~~',
+ 'Menu:UserManagement' => 'User management~~',
'Menu:Queries' => 'Queries~~',
'Menu:ConfigurationTools' => 'Configuration~~'
));
diff --git a/dictionaries/da.dictionary.itop.core.php b/dictionaries/da.dictionary.itop.core.php
index 3f915d120..6e04906a4 100644
--- a/dictionaries/da.dictionary.itop.core.php
+++ b/dictionaries/da.dictionary.itop.core.php
@@ -475,20 +475,24 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:ActionEmail' => 'Email besked',
'Class:ActionEmail+' => '',
- 'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified: just the Test recipient, all (To, cc and Bcc) or no-one~~',
+ 'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified:
+- Being tested: just the Test recipient,
+- In production: all (To, cc and Bcc)
+- Inactive: no-one~~',
'Class:ActionEmail/Attribute:status/Value:test+' => 'Only the Test recipient is notified~~',
'Class:ActionEmail/Attribute:status/Value:enabled+' => 'All To, Cc and Bcc emails are notified~~',
'Class:ActionEmail/Attribute:status/Value:disabled+' => 'The email notification will not be sent~~',
'Class:ActionEmail/Attribute:test_recipient' => 'Test modtager',
'Class:ActionEmail/Attribute:test_recipient+' => '',
- 'Class:ActionEmail/Attribute:from' => 'Fra~~',
- 'Class:ActionEmail/Attribute:from+' => 'Afsender af emailen~~',
+ 'Class:ActionEmail/Attribute:from' => 'Fra',
+ 'Class:ActionEmail/Attribute:from+' => 'Afsender af emailen',
'Class:ActionEmail/Attribute:from_label' => 'From (label)~~',
- 'Class:ActionEmail/Attribute:from_label+' => 'Sender display name will be sent into the email header~~',
- 'Class:ActionEmail/Attribute:reply_to' => 'Svar til~~',
- 'Class:ActionEmail/Attribute:reply_to+' => 'Svar sendes til~~',
+ 'Class:ActionEmail/Attribute:from_label+' => 'Either a static label or a placeholder like $this->agent_id->friendlyname$~~',
+ 'Class:ActionEmail/Attribute:reply_to' => 'Svar til',
+ 'Class:ActionEmail/Attribute:reply_to+' => 'Svar sendes til',
'Class:ActionEmail/Attribute:reply_to_label' => 'Reply to (label)~~',
- 'Class:ActionEmail/Attribute:reply_to_label+' => 'Reply to display name will be sent into the email header~~',
+ 'Class:ActionEmail/Attribute:reply_to_label+' => 'Either a static label or a placeholder like $this->team_id->friendlyname$.
+If omitted the From (label) is used.~~',
'Class:ActionEmail/Attribute:to' => 'Til',
'Class:ActionEmail/Attribute:to+' => 'Modtager af emailen',
'Class:ActionEmail/Attribute:cc' => 'Cc',
@@ -555,9 +559,9 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:TriggerOnObject/Attribute:target_class' => 'Target klasse',
'Class:TriggerOnObject/Attribute:target_class+' => '',
'Class:TriggerOnObject/Attribute:filter' => 'Filter~~',
- 'Class:TriggerOnObject/Attribute:filter+' => 'Limit the object list (of the target class) which will activate the trigger~~~',
+ 'Class:TriggerOnObject/Attribute:filter+' => 'Limit the object list (of the target class) which will activate the trigger~~',
'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s~~',
- 'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class \\"%1$s\\"~~',
+ 'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class "%1$s"~~',
));
//
@@ -905,12 +909,12 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',
// Explain working time computing
- 'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \\"%1$s\\")~~',
- 'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \\"%1$s\\"~~',
- 'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \\"%1$s\\" at %2$d%%~~',
+ 'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as "%1$s")~~',
+ 'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for "%1$s"~~',
+ 'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for "%1$s" at %2$d%%~~',
// Bulk export
- 'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \\"%1$s\\"~~',
- 'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \\"query\\". There is no Query Phrasebook corresponding to the id: \\"%1$s\\".~~',
+ 'Core:BulkExport:MissingParameter_Param' => 'Missing parameter "%1$s"~~',
+ 'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter "query". There is no Query Phrasebook corresponding to the id: "%1$s".~~',
'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
'Core:BulkExportOf_Class' => '%1$s Export~~',
'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s~~',
@@ -1011,7 +1015,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code~~',
'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Used tags cannot be deleted~~',
'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Tags codes or labels must be unique~~',
- 'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters~~',
+ 'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters, starting with a letter.~~',
'Core:TagSetFieldData:ErrorTagCodeReservedWord' => 'The chosen tag code is a reserved word~~',
'Core:TagSetFieldData:ErrorTagLabelSyntax' => 'Tags label must not contain \'%1$s\' nor be empty~~',
'Core:TagSetFieldData:ErrorCodeUpdateNotAllowed' => 'Tags Code cannot be changed when used~~',
diff --git a/dictionaries/da.dictionary.itop.ui.php b/dictionaries/da.dictionary.itop.ui.php
index 841c7427d..d0ee60239 100644
--- a/dictionaries/da.dictionary.itop.ui.php
+++ b/dictionaries/da.dictionary.itop.ui.php
@@ -356,16 +356,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:UserDashboard/Attribute:contents+' => '~~',
));
-//
-// Expression to Natural language
-//
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
- 'Expression:Unit:Short:DAY' => 'd~~',
- 'Expression:Unit:Short:WEEK' => 'w~~',
- 'Expression:Unit:Short:MONTH' => 'm~~',
- 'Expression:Unit:Short:YEAR' => 'y~~',
-));
-
//
// Duplicated into itop-welcome-itil ( will be removed from here...)
//
@@ -423,7 +413,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
Implement ITIL processes at your own pace.
Manage the most important asset of your IT: Documentation.
-~~',
+',
'UI:WelcomeMenu:Text' => 'Congratulations, you landed on '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!
This version features a brand new modern and accessible backoffice design.
@@ -439,8 +429,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:WelcomeMenu:MyIncidents' => 'Incidents tildelt mig',
'UI:AllOrganizations' => ' Alle Organisationer',
'UI:YourSearch' => 'Din Søgning',
- 'UI:LoggedAsMessage' => 'Logget ind som %1$s (%2$s)~~',
- 'UI:LoggedAsMessage+Admin' => 'Logget ind som %1$s (%2$s, Administrator)~~',
+ 'UI:LoggedAsMessage' => 'Logget ind som %1$s (%2$s)',
+ 'UI:LoggedAsMessage+Admin' => 'Logget ind som %1$s (%2$s, Administrator)',
'UI:Button:Logoff' => 'Log ud',
'UI:Button:GlobalSearch' => 'Søg',
'UI:Button:Search' => ' Søg ',
@@ -487,7 +477,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:InputFile:NoFileSelected' => 'No File Selected~~',
'UI:InputFile:SelectFile' => 'Select a file~~',
'UI:SearchToggle' => 'Søg',
- 'UI:ClickToCreateNew' => 'Opret nyt objekt af typen %1$s~~',
+ 'UI:ClickToCreateNew' => 'Opret nyt objekt af typen %1$s',
'UI:SearchFor_Class' => 'Søg efter objekter af typen %1$s',
'UI:NoObjectToDisplay' => 'Ingen objekter at vise.',
'UI:Error:SaveFailed' => 'The object cannot be saved :~~',
@@ -648,7 +638,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - Bulk import',
'UI:Title:BulkImport+' => 'CSV-Import assistent',
'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronisering af %1$d objekter af klasse %2$s',
- 'UI:CSVImport:ClassesSelectOne' => '-- Vælg venligst --~~',
+ 'UI:CSVImport:ClassesSelectOne' => '-- Vælg venligst --',
'UI:CSVImport:ErrorExtendedAttCode' => 'Intern fejl: "%1$s" er en ukorrekt kode fordi "%2$s" er IKKE en fremmed nøgle af klassen "%3$s"',
'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objekt(er) vil forblive uændrede.',
'UI:CSVImport:ObjectsWillBeModified' => '%1$d objekt(er) vil blive ændret.',
@@ -698,7 +688,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:UniversalSearch:Error' => 'Fejl: %1$s',
'UI:UniversalSearch:LabelSelectTheClass' => 'Vælg klasse at søge efter: ',
'UI:CSVReport-Value-Modified' => 'Ændret',
- 'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
+ 'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute',
'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
@@ -782,7 +772,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:Audit:Dashboard:ObjectsAudited' => 'Objects audited~~',
'UI:Audit:Dashboard:ObjectsInError' => 'Objects in errors~~',
'UI:Audit:Dashboard:ObjectsValidated' => 'Objects validated~~',
- 'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%%~~',
+ 'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%% of the object are valid~~',
'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - OQL Query Evaluering',
'UI:RunQuery:QueryExamples' => 'Query Eksempler',
'UI:RunQuery:QueryResults' => 'Query Results~~',
@@ -801,9 +791,9 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:RunQuery:ResultSQL' => 'Resulting SQL~~',
'UI:RunQuery:Error' => 'Der opstod en fejl under afviklingen af forespøgrslen',
'UI:Query:UrlForExcel' => 'URL til brug for MS-Excel web forespøgrsler',
- 'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page export-V2.php cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: export.php. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of '.ITOP_APPLICATION_SHORT.'.Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page export-V2.php.~~',
+ 'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page export-V2.php cannot be invoked without this information. Therefore, the URL suggested here below points to the legacy page: export.php. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of '.ITOP_APPLICATION_SHORT.'.
Should you want to guarantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page export-V2.php.~~',
'UI:Schema:Title' => ITOP_APPLICATION_SHORT.' objekt skema',
- 'UI:Schema:TitleForClass' => '%1$s skema~~',
+ 'UI:Schema:TitleForClass' => '%1$s skema',
'UI:Schema:CategoryMenuItem' => 'Kategori %1$s',
'UI:Schema:Relationships' => 'Relationer',
'UI:Schema:AbstractClass' => 'Abstrakt klasse: intet objekt fra denne klasse kan instantieres.',
@@ -944,8 +934,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:SearchResultsTitle' => 'Søge Resultater',
'UI:SearchResultsTitle+' => 'Full-text search results~~',
'UI:Search:NoSearch' => 'Intet at søge efter',
- 'UI:Search:NeedleTooShort' => 'The search string \\"%1$s\\" is too short. Please type at least %2$d characters.~~',
- 'UI:Search:Ongoing' => 'Searching for \\"%1$s\\"~~',
+ 'UI:Search:NeedleTooShort' => 'The search string "%1$s" is too short. Please type at least %2$d characters.~~',
+ 'UI:Search:Ongoing' => 'Searching for "%1$s"~~',
'UI:Search:Enlarge' => 'Broaden the search~~',
'UI:FullTextSearchTitle_Text' => 'Resultater for "%1$s":',
'UI:Search:Count_ObjectsOf_Class_Found' => '%1$d objekt(er) af klasse %2$s fundet.',
@@ -953,7 +943,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:ModificationPageTitle_Object_Class' => ITOP_APPLICATION_SHORT.' - %1$s - %2$s ændring',
'UI:ModificationTitle_Class_Object' => 'Ændring af %1$s: %2$s',
'UI:ClonePageTitle_Object_Class' => ITOP_APPLICATION_SHORT.' - Clone %1$s - %2$s ændring',
- 'UI:CloneTitle_Class_Object' => 'Clone af %1$s: %2$s~~',
+ 'UI:CloneTitle_Class_Object' => 'Clone af %1$s: %2$s',
'UI:CreationPageTitle_Class' => ITOP_APPLICATION_SHORT.' - Oprettelse af ny %1$s ',
'UI:CreationTitle_Class' => 'Oprettelse af ny %1$s',
'UI:SelectTheTypeOf_Class_ToCreate' => 'Vælg type af %1$s for oprettelse:',
@@ -1039,7 +1029,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI-ContactsMenu-ContactsByLocation' => 'Kontakter efter lokation',
'UI-ContactsMenu-ContactsByType' => 'Kontakter efter type',
'UI-ContactsMenu-ContactsByStatus' => 'Kontakter efter status',
- 'UI:NotificationsMenu:Title' => 'Konfiguration af Notifikationer~~',
+ 'UI:NotificationsMenu:Title' => 'Konfiguration af Notifikationer',
'UI:NotificationsMenu:Help' => 'Hjælp',
'UI:NotificationsMenu:HelpContent' => 'I '.ITOP_APPLICATION_SHORT.' er notifikationer fuldt modificerbare. De er baseret på to sæt af objekter: triggers og handlinger.
Triggers define when a notification will be executed. There are different triggers as part of '.ITOP_APPLICATION_SHORT.' core, but others can be brought by extensions:
@@ -1058,7 +1048,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
For udførelse, handlinger skal være knyttet til triggers.
-Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge" nummer, der specificerer i hvilken rækkefølge handlingerne udføres.
~~',
+Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge" nummer, der specificerer i hvilken rækkefølge handlingerne udføres.',
'UI:NotificationsMenu:Triggers' => 'Triggers',
'UI:NotificationsMenu:AvailableTriggers' => 'Tilgængelige triggers',
'UI:NotificationsMenu:OnCreate' => 'Når et objekt oprettes',
@@ -1077,8 +1067,8 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
'UI:iTopVersion:Short' => '%1$s version %2$s',
'UI:iTopVersion:Long' => '%1$s version %2$s-%3$s built on %4$s',
'UI:PropertiesTab' => 'Egenskaber',
- 'UI:OpenDocumentInNewWindow_' => 'Åben~~',
- 'UI:DownloadDocument_' => 'Hent~~',
+ 'UI:OpenDocumentInNewWindow_' => 'Åben',
+ 'UI:DownloadDocument_' => 'Hent',
'UI:Document:NoPreview' => 'Forhåndsvisning er ikke tilgængelig for denne dokumenttype',
'UI:Download-CSV' => 'Download %1$s',
'UI:DeadlineMissedBy_duration' => 'Overskredet med %1$s',
@@ -1203,10 +1193,10 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
'UI:FavoriteOrganizations' => 'Favorit Organisationer',
'UI:FavoriteOrganizations+' => '',
- 'UI:FavoriteLanguage' => 'Sprog i brugergrænseflade~~',
+ 'UI:FavoriteLanguage' => 'Sprog i brugergrænseflade',
'UI:Favorites:SelectYourLanguage' => 'Vælg dit foretrukne sprog',
'UI:FavoriteOtherSettings' => 'Andre indstillinger',
- 'UI:Favorites:Default_X_ItemsPerPage' => 'Default længde for lister: %1$s emner per side~~',
+ 'UI:Favorites:Default_X_ItemsPerPage' => 'Default længde for lister: %1$s emner per side',
'UI:Favorites:ShowObsoleteData' => 'Show obsolete data~~',
'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
'UI:NavigateAwayConfirmationMessage' => 'Enhver ændring vil blive kasseret.',
@@ -1631,24 +1621,24 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Menu:DataSources' => 'Synkroniserings Data Kilder',
- 'Menu:DataSources+' => 'All Synchronization Data Sources~~',
+ 'Menu:DataSources+' => 'Data synchro used for batch import of external data~~',
'Menu:AuditCategories' => 'Audit Kategorier',
- 'Menu:AuditCategories+' => 'Audit Categories~~',
+ 'Menu:AuditCategories+' => 'Define rules to audit the quality of '.ITOP_APPLICATION_SHORT.' data~~',
'Menu:Notifications:Title' => 'Audit Kategorier',
'Menu:AuditCategories:Title' => 'Audit configuration~~',
'Menu:RunQueriesMenu' => 'Kør forespørgsler',
- 'Menu:RunQueriesMenu+' => 'Run any query~~',
+ 'Menu:RunQueriesMenu+' => 'Write and execute any OQL query~~',
'Menu:QueryMenu' => 'Query parlør',
- 'Menu:QueryMenu+' => 'Query phrasebook~~',
+ 'Menu:QueryMenu+' => 'Reusable stored queries~~',
'Menu:UniversalSearchMenu' => 'Universal Søgning',
- 'Menu:UniversalSearchMenu+' => 'Search for anything...~~',
+ 'Menu:UniversalSearchMenu+' => 'Search objects of any class including abstract~~',
'Menu:UserManagementMenu' => 'Bruger styring',
- 'Menu:UserManagementMenu+' => 'User management~~',
+ 'Menu:UserManagementMenu+' => 'Who can connect to '.ITOP_APPLICATION_SHORT.' and what can they do?~~',
'Menu:ProfilesMenu' => 'Profiler',
- 'Menu:ProfilesMenu+' => 'Profiles~~',
+ 'Menu:ProfilesMenu+' => 'View existing Profiles~~',
'Menu:ProfilesMenu:Title' => 'Profiler',
'Menu:UserAccountsMenu' => 'Bruger konti',
- 'Menu:UserAccountsMenu+' => 'User accounts~~',
+ 'Menu:UserAccountsMenu+' => 'Handling '.ITOP_APPLICATION_SHORT.' users and their access rights~~',
'Menu:UserAccountsMenu:Title' => 'Bruger konti',
'Menu:UserManagement' => 'User management~~',
'Menu:Queries' => 'Queries~~',
diff --git a/dictionaries/de.dictionary.itop.ui.php b/dictionaries/de.dictionary.itop.ui.php
index 3b9ed8cc9..47948708a 100644
--- a/dictionaries/de.dictionary.itop.ui.php
+++ b/dictionaries/de.dictionary.itop.ui.php
@@ -355,16 +355,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'Class:UserDashboard/Attribute:contents+' => '',
));
-//
-// Expression to Natural language
-//
-Dict::Add('DE DE', 'German', 'Deutsch', array(
- 'Expression:Unit:Short:DAY' => 't',
- 'Expression:Unit:Short:WEEK' => 'w',
- 'Expression:Unit:Short:MONTH' => 'm',
- 'Expression:Unit:Short:YEAR' => 'j',
-));
-
//
// Duplicated into itop-welcome-itil ( will be removed from here...)
//
diff --git a/dictionaries/en.dictionary.itop.core.php b/dictionaries/en.dictionary.itop.core.php
index b29d629b7..c3d2f1acd 100644
--- a/dictionaries/en.dictionary.itop.core.php
+++ b/dictionaries/en.dictionary.itop.core.php
@@ -1061,9 +1061,9 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:TagSetFieldData/Attribute:label+' => 'Displayed label',
'Class:TagSetFieldData/Attribute:description' => 'Description',
'Class:TagSetFieldData/Attribute:description+' => '',
- 'Class:TagSetFieldData/Attribute:finalclass' => 'Tag class~~',
- 'Class:TagSetFieldData/Attribute:obj_class' => 'Object class~~',
- 'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code~~',
+ 'Class:TagSetFieldData/Attribute:finalclass' => 'Tag class',
+ 'Class:TagSetFieldData/Attribute:obj_class' => 'Object class',
+ 'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code',
'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Used tags cannot be deleted',
'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Tags codes or labels must be unique',
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 99cb073f4..0043fe1c3 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -375,16 +375,6 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:UserDashboard/Attribute:contents+' => '',
));
-//
-// Expression to Natural language
-//
-Dict::Add('EN US', 'English', 'English', array(
- 'Expression:Unit:Short:DAY' => 'd',
- 'Expression:Unit:Short:WEEK' => 'w',
- 'Expression:Unit:Short:MONTH' => 'm',
- 'Expression:Unit:Short:YEAR' => 'y',
-));
-
//
// Duplicated into itop-welcome-itil ( will be removed from here...)
//
@@ -901,13 +891,13 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:Schema:LifeCycleAttributeMustChange' => 'Must change',
'UI:Schema:LifeCycleAttributeMustPrompt' => 'User will be prompted to change the value',
'UI:Schema:LifeCycleEmptyList' => 'empty list',
- 'UI:Schema:ClassFilter' => 'Class:~~',
- 'UI:Schema:DisplayLabel' => 'Display:~~',
- 'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
- 'UI:Schema:DisplaySelector/Label' => 'Label~~',
- 'UI:Schema:DisplaySelector/Code' => 'Code~~',
- 'UI:Schema:Attribute/Filter' => 'Filter~~',
- 'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
+ 'UI:Schema:ClassFilter' => 'Class:',
+ 'UI:Schema:DisplayLabel' => 'Display:',
+ 'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code',
+ 'UI:Schema:DisplaySelector/Label' => 'Label',
+ 'UI:Schema:DisplaySelector/Code' => 'Code',
+ 'UI:Schema:Attribute/Filter' => 'Filter',
+ 'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"',
'UI:Schema:Events' => 'Events',
'UI:Schema:Events:Defined' => 'Defined events',
'UI:Schema:Events:NoEvent' => 'No event defined',
@@ -1461,7 +1451,7 @@ When associated with a trigger, each action is given an "order" number, specifyi
'Month-10-Short' => 'Oct',
'Month-11-Short' => 'Nov',
'Month-12-Short' => 'Dec',
- 'Calendar-FirstDayOfWeek' => 0,
+ 'Calendar-FirstDayOfWeek' => '0',
// 0 = Sunday, 1 = Monday, etc...
'UI:Menu:ShortcutList' => 'Create a Shortcut...',
diff --git a/dictionaries/es_cr.dictionary.itop.ui.php b/dictionaries/es_cr.dictionary.itop.ui.php
index aa444e89a..04e46046c 100644
--- a/dictionaries/es_cr.dictionary.itop.ui.php
+++ b/dictionaries/es_cr.dictionary.itop.ui.php
@@ -368,16 +368,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
'Class:UserDashboard/Attribute:contents+' => 'Contenidos',
));
-//
-// Expression to Natural language
-//
-Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
- 'Expression:Unit:Short:DAY' => 'd',
- 'Expression:Unit:Short:WEEK' => 's',
- 'Expression:Unit:Short:MONTH' => 'm',
- 'Expression:Unit:Short:YEAR' => 'a',
-));
-
//
// Duplicated into itop-welcome-itil ( will be removed from here...)
//
@@ -710,7 +700,7 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
'UI:UniversalSearch:Error' => 'Error: %1$s',
'UI:UniversalSearch:LabelSelectTheClass' => 'Seleccione la clase a buscar: ',
'UI:CSVReport-Value-Modified' => 'Modificado',
- 'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
+ 'UI:CSVReport-Value-SetIssue' => 'Invalid value for attribute~~',
'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
@@ -1094,8 +1084,8 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
'UI:iTopVersion:Short' => '%1$s versión %2$s',
'UI:iTopVersion:Long' => '%1$s versión %2$s-%3$s compilada en %4$s',
'UI:PropertiesTab' => 'Propiedades',
- 'UI:OpenDocumentInNewWindow_' => 'Abrir~~',
- 'UI:DownloadDocument_' => 'Descargar~~',
+ 'UI:OpenDocumentInNewWindow_' => 'Abrir',
+ 'UI:DownloadDocument_' => 'Descargar',
'UI:Document:NoPreview' => 'No hay prevista disponible para este tipo de archivo',
'UI:Download-CSV' => 'Descargar %1$s',
'UI:DeadlineMissedBy_duration' => 'No se cumplió por %1$s',
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index a5a4c7afb..5ce828572 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -359,16 +359,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:UserDashboard/Attribute:contents+' => '',
));
-//
-// Expression to Natural language
-//
-Dict::Add('FR FR', 'French', 'Français', array(
- 'Expression:Unit:Short:DAY' => 'j',
- 'Expression:Unit:Short:WEEK' => 's',
- 'Expression:Unit:Short:MONTH' => 'm',
- 'Expression:Unit:Short:YEAR' => 'a',
-));
-
//
// Duplicated into itop-welcome-itil ( will be removed from here...)
//
@@ -806,7 +796,7 @@ Nous espérons que vous aimerez cette version autant que nous avons eu du plaisi
'UI:Query:UrlForExcel' => 'Lien à copier-coller dans Excel, pour déclarer une source de données à partir du web',
'UI:Query:UrlV1' => 'La liste des champs à exporter n\'a pas été spécifiée. La page export-V2.php ne peut pas fonctionner sans cette information. Par conséquent, le lien fourni ci-dessous pointe sur l\'ancienne page: export.php. Cette ancienne version de l\'export présente la limitation suivante : la liste des champs exportés varie en fonction du format de l\'export et du modèle de données.
Si vous devez garantir la stabilité du format de l\'export (liste des colonnes) sur le long terme, alors vous devrez renseigner l\'attribut "Champs" et utiliser la page export-V2.php.',
'UI:Schema:Title' => 'Modèle de données '.ITOP_APPLICATION_SHORT,
- 'UI:Schema:TitleForClass' => 'Modèle de données de %1$s~~',
+ 'UI:Schema:TitleForClass' => 'Modèle de données de %1$s',
'UI:Schema:CategoryMenuItem' => 'Catégorie %1$s',
'UI:Schema:Relationships' => 'Relations',
'UI:Schema:AbstractClass' => 'Classe abstraite : les objets de cette classe ne peuvent pas être instanciés.',
@@ -939,7 +929,7 @@ Nous espérons que vous aimerez cette version autant que nous avons eu du plaisi
'Tag:Archived' => 'Archivé',
'Tag:Archived+' => 'Accessible seulement dans le mode Archive',
'Tag:Obsolete' => 'Obsolète',
- 'Tag:Obsolete+' => 'Exclu de l\'analyse d\'impact et des résultats de recherche~~',
+ 'Tag:Obsolete+' => 'Exclu de l\'analyse d\'impact et des résultats de recherche',
'Tag:Synchronized' => 'Synchronisé',
'ObjectRef:Archived' => 'Archivé',
'ObjectRef:Obsolete' => 'Obsolète',
diff --git a/dictionaries/hu.dictionary.itop.ui.php b/dictionaries/hu.dictionary.itop.ui.php
index 7f8c06160..d6fc70a87 100755
--- a/dictionaries/hu.dictionary.itop.ui.php
+++ b/dictionaries/hu.dictionary.itop.ui.php
@@ -13,7 +13,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:AuditCategory/Attribute:definition_set' => 'Definíciókészlet',
'Class:AuditCategory/Attribute:definition_set+' => '',
'Class:AuditCategory/Attribute:rules_list' => 'Auditszabályok',
- 'Class:AuditCategory/Attribute:rules_list+' => 'Audit rules for this category~~',
+ 'Class:AuditCategory/Attribute:rules_list+' => 'Audit rules using the object scope of this category~~',
'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Warning threshold~~',
'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Percentage of invalid objects below which the result is a warning (orange)~~',
'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error threshold~~',
@@ -356,16 +356,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:UserDashboard/Attribute:contents+' => '~~',
));
-//
-// Expression to Natural language
-//
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
- 'Expression:Unit:Short:DAY' => 'n',
- 'Expression:Unit:Short:WEEK' => 'w',
- 'Expression:Unit:Short:MONTH' => 'h',
- 'Expression:Unit:Short:YEAR' => 'é',
-));
-
//
// Duplicated into itop-welcome-itil ( will be removed from here...)
//
diff --git a/dictionaries/it.dictionary.itop.core.php b/dictionaries/it.dictionary.itop.core.php
index fdf7d4098..c97229c4a 100644
--- a/dictionaries/it.dictionary.itop.core.php
+++ b/dictionaries/it.dictionary.itop.core.php
@@ -475,20 +475,24 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:ActionEmail' => 'Email di notifica',
'Class:ActionEmail+' => '',
- 'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified: just the Test recipient, all (To, cc and Bcc) or no-one~~',
+ 'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified:
+- Being tested: just the Test recipient,
+- In production: all (To, cc and Bcc)
+- Inactive: no-one~~',
'Class:ActionEmail/Attribute:status/Value:test+' => 'Only the Test recipient is notified~~',
'Class:ActionEmail/Attribute:status/Value:enabled+' => 'All To, Cc and Bcc emails are notified~~',
'Class:ActionEmail/Attribute:status/Value:disabled+' => 'The email notification will not be sent~~',
'Class:ActionEmail/Attribute:test_recipient' => 'Test destinatario',
'Class:ActionEmail/Attribute:test_recipient+' => '',
- 'Class:ActionEmail/Attribute:from' => 'Da~~',
+ 'Class:ActionEmail/Attribute:from' => 'Da',
'Class:ActionEmail/Attribute:from+' => '',
'Class:ActionEmail/Attribute:from_label' => 'From (label)~~',
- 'Class:ActionEmail/Attribute:from_label+' => 'Sender display name will be sent into the email header~~',
- 'Class:ActionEmail/Attribute:reply_to' => 'Rispondi A~~',
+ 'Class:ActionEmail/Attribute:from_label+' => 'Either a static label or a placeholder like $this->agent_id->friendlyname$~~',
+ 'Class:ActionEmail/Attribute:reply_to' => 'Rispondi A',
'Class:ActionEmail/Attribute:reply_to+' => '',
'Class:ActionEmail/Attribute:reply_to_label' => 'Reply to (label)~~',
- 'Class:ActionEmail/Attribute:reply_to_label+' => 'Reply to display name will be sent into the email header~~',
+ 'Class:ActionEmail/Attribute:reply_to_label+' => 'Either a static label or a placeholder like $this->team_id->friendlyname$.
+If omitted the From (label) is used.~~',
'Class:ActionEmail/Attribute:to' => 'A',
'Class:ActionEmail/Attribute:to+' => 'Destinatario dell\'email',
'Class:ActionEmail/Attribute:cc' => 'Cc',
@@ -557,7 +561,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:TriggerOnObject/Attribute:filter' => 'Filter~~',
'Class:TriggerOnObject/Attribute:filter+' => 'Limit the object list (of the target class) which will activate the trigger~~',
'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s~~',
- 'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class \\"%1$s\\"~~',
+ 'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class "%1$s"~~',
));
//
@@ -770,8 +774,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Core:Synchro:LastestStatus' => 'Ultimo stato',
'Core:Synchro:History' => 'Storia della sincronizzazione',
'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...~~',
+ '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',
// Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:DataSources+' => '',
@@ -779,7 +783,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Core:Synchro:label_repl_ignored' => 'Ignorato(%1$s)',
'Core:Synchro:label_repl_disappeared' => 'Scomparso (%1$s)',
'Core:Synchro:label_repl_existing' => 'Esistente (%1$s)',
- 'Core:Synchro:label_repl_new' => 'Nuovo (%1$s)~~',
+ 'Core:Synchro:label_repl_new' => 'Nuovo (%1$s)',
'Core:Synchro:label_obj_deleted' => 'Cancellato (%1$s)',
'Core:Synchro:label_obj_obsoleted' => 'Obsoleto (%1$s)',
'Core:Synchro:label_obj_disappeared_errors' => 'Errori (%1$s)',
@@ -800,7 +804,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'The table %1$s already exists in the database. Please use another name for the synchro data table.~~',
'Core:SynchroReplica:PublicData' => 'Dati Pubblici',
'Core:SynchroReplica:PrivateDetails' => 'Dettagli Privati',
- 'Core:SynchroReplica:BackToDataSource' => 'Torna indietro alla sorgente di sincronizzazione dei dati: %1$s~~',
+ 'Core:SynchroReplica:BackToDataSource' => 'Torna indietro alla sorgente di sincronizzazione dei dati: %1$s',
'Core:SynchroReplica:ListOfReplicas' => 'Lista della Replica',
'Core:SynchroAttExtKey:ReconciliationById' => 'id (Chiave Primaria)',
'Core:SynchroAtt:attcode' => 'Attributo',
@@ -817,9 +821,9 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Core:Synchro:ListOfDataSources' => 'Lista delle sorgenti di dati:',
'Core:Synchro:LastSynchro' => 'Ultima sincronizzazione:',
'Core:Synchro:ThisObjectIsSynchronized' => 'Questo oggetto è sincronizzato con una sorgente esterna di dati',
- 'Core:Synchro:TheObjectWasCreatedBy_Source' => 'L\'oggetti è stato creato da una sorgente esterna di dati %1$s~~',
- 'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'L\'oggetti può essere cancellato da una sorgente esterna di dati %1$s~~',
- 'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'Tu non puoi cancellare l\'oggetto perché è di proprietà della sorgente dati esterna %1$s~~',
+ 'Core:Synchro:TheObjectWasCreatedBy_Source' => 'L\'oggetti è stato creato da una sorgente esterna di dati %1$s',
+ 'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'L\'oggetti può essere cancellato da una sorgente esterna di dati %1$s',
+ 'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'Tu non puoi cancellare l\'oggetto perché è di proprietà della sorgente dati esterna %1$s',
'TitleSynchroExecution' => 'Esecuzione della sincronizzazione',
'Class:SynchroDataSource:DataTable' => 'Tabella del database: %1$s',
'Core:SyncDataSourceObsolete' => 'La fonte dei dati è contrassegnata come obsoleta. Operazione annullata',
@@ -905,12 +909,12 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$sec',
'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sg %2$dh %3$dmin %4$ds',
// Explain working time computing
- 'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \\"%1$s\\")~~',
- 'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \\"%1$s\\"~~',
- 'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \\"%1$s\\" at %2$d%%~~',
+ 'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as "%1$s")~~',
+ 'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for "%1$s"~~',
+ 'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for "%1$s" at %2$d%%~~',
// Bulk export
- 'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \\"%1$s\\"~~',
- 'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \\"query\\". There is no Query Phrasebook corresponding to the id: \\"%1$s\\".~~',
+ 'Core:BulkExport:MissingParameter_Param' => 'Missing parameter "%1$s"~~',
+ 'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter "query". There is no Query Phrasebook corresponding to the id: "%1$s".~~',
'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
'Core:BulkExportOf_Class' => '%1$s Export~~',
'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s~~',
@@ -1011,7 +1015,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code~~',
'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Used tags cannot be deleted~~',
'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Tags codes or labels must be unique~~',
- 'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters~~',
+ 'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters, starting with a letter.~~',
'Core:TagSetFieldData:ErrorTagCodeReservedWord' => 'The chosen tag code is a reserved word~~',
'Core:TagSetFieldData:ErrorTagLabelSyntax' => 'Tags label must not contain \'%1$s\' nor be empty~~',
'Core:TagSetFieldData:ErrorCodeUpdateNotAllowed' => 'Tags Code cannot be changed when used~~',
diff --git a/dictionaries/it.dictionary.itop.ui.php b/dictionaries/it.dictionary.itop.ui.php
index 109afa669..0d740c9b2 100644
--- a/dictionaries/it.dictionary.itop.ui.php
+++ b/dictionaries/it.dictionary.itop.ui.php
@@ -367,16 +367,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:UserDashboard/Attribute:contents+' => '~~',
));
-//
-// Expression to Natural language
-//
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
- 'Expression:Unit:Short:DAY' => 'd~~',
- 'Expression:Unit:Short:WEEK' => 'w~~',
- 'Expression:Unit:Short:MONTH' => 'm~~',
- 'Expression:Unit:Short:YEAR' => 'y~~',
-));
-
//
// Duplicated into itop-welcome-itil ( will be removed from here...)
//
@@ -450,8 +440,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:WelcomeMenu:MyIncidents' => 'Incidenti assegnati a me',
'UI:AllOrganizations' => ' Tutte le Organizzazioni ',
'UI:YourSearch' => 'La tua Cerca',
- 'UI:LoggedAsMessage' => 'Logged come %1$s (%2$s)~~',
- 'UI:LoggedAsMessage+Admin' => 'Logged come %1$s (%2$s, Amministratore)~~',
+ 'UI:LoggedAsMessage' => 'Logged come %1$s (%2$s)',
+ 'UI:LoggedAsMessage+Admin' => 'Logged come %1$s (%2$s, Amministratore)',
'UI:Button:Logoff' => 'Log off',
'UI:Button:GlobalSearch' => 'Cerca',
'UI:Button:Search' => ' Cerca',
@@ -471,23 +461,23 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:Button:Restart' => ' |<< Riavvia',
'UI:Button:Next' => ' Prossimo >> ',
'UI:Button:Finish' => ' Fine',
- 'UI:Button:DoImport' => ' Esegui le Imporazioni ! ~~',
+ 'UI:Button:DoImport' => ' Esegui le Imporazioni ! ',
'UI:Button:Done' => ' Fatto',
- 'UI:Button:SimulateImport' => ' Simula l\'Importazione ~~',
+ 'UI:Button:SimulateImport' => ' Simula l\'Importazione ',
'UI:Button:Test' => 'Testa!',
'UI:Button:Evaluate' => ' Valuta',
'UI:Button:Evaluate:Title' => ' Valuta (Ctrl+Enter)',
- 'UI:Button:AddObject' => ' Aggiungi... ~~',
- 'UI:Button:BrowseObjects' => ' Sfoglia... ~~',
- 'UI:Button:Add' => ' Aggiungi ~~',
- 'UI:Button:AddToList' => ' << Aggiungi ~~',
- 'UI:Button:RemoveFromList' => ' Rimuovi >> ~~',
- 'UI:Button:FilterList' => ' Filtra... ~~',
- 'UI:Button:Create' => ' Crea ~~',
- 'UI:Button:Delete' => ' Cancella ~~',
- 'UI:Button:Rename' => ' Rename... ~~',
- 'UI:Button:ChangePassword' => ' Cambia Password ~~',
- 'UI:Button:ResetPassword' => ' Resetta Password ~~',
+ 'UI:Button:AddObject' => ' Aggiungi... ',
+ 'UI:Button:BrowseObjects' => ' Sfoglia... ',
+ 'UI:Button:Add' => ' Aggiungi ',
+ 'UI:Button:AddToList' => ' << Aggiungi ',
+ 'UI:Button:RemoveFromList' => ' Rimuovi >> ',
+ 'UI:Button:FilterList' => ' Filtra... ',
+ 'UI:Button:Create' => ' Crea ',
+ 'UI:Button:Delete' => ' Cancella ',
+ 'UI:Button:Rename' => ' Rename... ',
+ 'UI:Button:ChangePassword' => ' Cambia Password ',
+ 'UI:Button:ResetPassword' => ' Resetta Password ',
'UI:Button:Insert' => 'Insert~~',
'UI:Button:More' => 'More~~',
'UI:Button:Less' => 'Less~~',
@@ -498,7 +488,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:InputFile:NoFileSelected' => 'No File Selected~~',
'UI:InputFile:SelectFile' => 'Select a file~~',
'UI:SearchToggle' => 'Cerca',
- 'UI:ClickToCreateNew' => 'Crea un nuovo %1$s~~',
+ 'UI:ClickToCreateNew' => 'Crea un nuovo %1$s',
'UI:SearchFor_Class' => 'Cerca l\'oggetto %1$s',
'UI:NoObjectToDisplay' => 'Nessun oggetto da mostrare.',
'UI:Error:SaveFailed' => 'The object cannot be saved :~~',
@@ -706,10 +696,10 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:CSVImport:AlertNoSearchCriteria' => 'Per favore seleziona almeno un criterio di ricerca',
'UI:CSVImport:Encoding' => 'Codifica dei caratteri',
'UI:UniversalSearchTitle' => ITOP_APPLICATION_SHORT.' - Ricerca Universale',
- 'UI:UniversalSearch:Error' => 'Errore: %1$s~~',
+ 'UI:UniversalSearch:Error' => 'Errore: %1$s',
'UI:UniversalSearch:LabelSelectTheClass' => 'Seleziona la classe per la ricerca: ',
'UI:CSVReport-Value-Modified' => 'Modified~~',
- 'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
+ 'UI:CSVReport-Value-SetIssue' => 'Invalid value for attribute~~',
'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
@@ -793,7 +783,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:Audit:Dashboard:ObjectsAudited' => 'Objects audited~~',
'UI:Audit:Dashboard:ObjectsInError' => 'Objects in errors~~',
'UI:Audit:Dashboard:ObjectsValidated' => 'Objects validated~~',
- 'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%%~~',
+ 'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%% of the object are valid~~',
'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - Valutazione Query OQL',
'UI:RunQuery:QueryExamples' => 'Esempi di Query',
'UI:RunQuery:QueryResults' => 'Query Results~~',
@@ -812,7 +802,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:RunQuery:ResultSQL' => 'Resulting SQL~~',
'UI:RunQuery:Error' => 'Si è verificato un errore durante l\'esecuzione della query',
'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries~~',
- 'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page export-V2.php cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: export.php. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of '.ITOP_APPLICATION_SHORT.'.Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page export-V2.php.~~',
+ 'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page export-V2.php cannot be invoked without this information. Therefore, the URL suggested here below points to the legacy page: export.php. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of '.ITOP_APPLICATION_SHORT.'.
Should you want to guarantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page export-V2.php.~~',
'UI:Schema:Title' => ITOP_APPLICATION_SHORT.' schema degli oggetti',
'UI:Schema:TitleForClass' => '%1$s schema~~',
'UI:Schema:CategoryMenuItem' => 'Categoria %1$s',
@@ -911,7 +901,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:Delete:NotAllowedToUpdate_Fields' => 'Non hai i permessi per aggiornare il seguente campo(i): %1$s',
'UI:Error:ActionNotAllowed' => 'You are not allowed to do this action~~',
'UI:Error:NotEnoughRightsToDelete' => 'Questo oggetto non può essere cancellato perché l\'utente corrente non dispone dei diritti necessari',
- 'UI:Error:CannotDeleteBecause' => 'Questo oggetto non può essere cancellato perchè: %1$s~~',
+ 'UI:Error:CannotDeleteBecause' => 'Questo oggetto non può essere cancellato perchè: %1$s',
'UI:Error:CannotDeleteBecauseOfDepencies' => 'Questo oggetto non può essere cancellato perché alcune operazioni manuali devono essere effettuate prima di questo',
'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'Questo oggetto non può essere cancellato perché alcune operazioni manuali devono essere effettuate prima di questo',
'UI:Archive_User_OnBehalfOf_User' => '%1$s a nome di %2$s',
@@ -924,13 +914,13 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s cancellato.',
'UI:Delete:ConfirmDeletionOf_Name' => 'Soppressione di %1$s',
'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => 'Soppressione di %1$d oggetti di classe %2$s',
- 'UI:Delete:CannotDeleteBecause' => 'Non può essere cancellato: %1$s~~',
- 'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Dovrebbe essere eliminato automaticamente, ma questo non è fattibile: %1$s~~',
- 'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Deve essere cancellato manualmente, ma questo non è fattibile: %1$s~~',
+ 'UI:Delete:CannotDeleteBecause' => 'Non può essere cancellato: %1$s',
+ 'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Dovrebbe essere eliminato automaticamente, ma questo non è fattibile: %1$s',
+ 'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Deve essere cancellato manualmente, ma questo non è fattibile: %1$s',
'UI:Delete:WillBeDeletedAutomatically' => 'Sarà cancellato automaticamente',
'UI:Delete:MustBeDeletedManually' => 'Deve essere cancellato manualmente',
- 'UI:Delete:CannotUpdateBecause_Issue' => 'Dovrebbero essere automaticamente aggiornati, ma: %1$s~~',
- 'UI:Delete:WillAutomaticallyUpdate_Fields' => 'Sarà automaticamente aggiornato (reset: %1$s)~~',
+ 'UI:Delete:CannotUpdateBecause_Issue' => 'Dovrebbero essere automaticamente aggiornati, ma: %1$s',
+ 'UI:Delete:WillAutomaticallyUpdate_Fields' => 'Sarà automaticamente aggiornato (reset: %1$s)',
'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d oggetti/link fanno riferimento %2$s',
'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d oggetti / link fanno riferimento alcuni degli oggetti da eliminare',
'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'Per garantire l\'integrità del database, ogni riferimento dovrebbe essere ulteriormente eliminato',
@@ -955,8 +945,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:SearchResultsTitle' => 'Risultati della ricerca',
'UI:SearchResultsTitle+' => 'Full-text search results~~',
'UI:Search:NoSearch' => 'Niente da ricercare',
- 'UI:Search:NeedleTooShort' => 'The search string \\"%1$s\\" is too short. Please type at least %2$d characters.~~',
- 'UI:Search:Ongoing' => 'Searching for \\"%1$s\\"~~',
+ 'UI:Search:NeedleTooShort' => 'The search string "%1$s" is too short. Please type at least %2$d characters.~~',
+ 'UI:Search:Ongoing' => 'Searching for "%1$s"~~',
'UI:Search:Enlarge' => 'Broaden the search~~',
'UI:FullTextSearchTitle_Text' => 'Risultati per "%1$s":',
'UI:Search:Count_ObjectsOf_Class_Found' => 'Trovato l\'oggetto(i) %1$d della classe %2$s.',
@@ -975,7 +965,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:PageTitle:ObjectCreated' => ITOP_APPLICATION_SHORT.' Oggetto Creato.',
'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s creato.',
'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => 'Applicazione %1$s all\'oggetto: %2$s nello stato %3$s allo stato target: %4$s.',
- 'UI:ObjectCouldNotBeWritten' => 'L\'oggetto non può essere scritto: %1$s~~',
+ 'UI:ObjectCouldNotBeWritten' => 'L\'oggetto non può essere scritto: %1$s',
'UI:PageTitle:FatalError' => ITOP_APPLICATION_SHORT.' - Fatal Error',
'UI:SystemIntrusion' => 'Accesso negato. Hai cercato di eseguire un\'operazione che non ti è consentita.',
'UI:FatalErrorMessage' => 'Fatal error, '.ITOP_APPLICATION_SHORT.' non può continuare.',
@@ -1069,7 +1059,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
Per essere eseguite, le azioni devono essere associate ai trigger.
-Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine", che specifica in quale ordine le azioni devono essere eseguite.
~~',
+Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine", che specifica in quale ordine le azioni devono essere eseguite.',
'UI:NotificationsMenu:Triggers' => 'Triggers',
'UI:NotificationsMenu:AvailableTriggers' => 'Triggers Disponibili',
'UI:NotificationsMenu:OnCreate' => 'When an object is created~~',
@@ -1088,8 +1078,8 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
'UI:iTopVersion:Short' => 'Versione %1$s %2$s',
'UI:iTopVersion:Long' => 'Versione %1$s %2$s-%3$s costruita il %4$s',
'UI:PropertiesTab' => 'Proprietà',
- 'UI:OpenDocumentInNewWindow_' => 'Aprire~~',
- 'UI:DownloadDocument_' => 'Scaricare~~',
+ 'UI:OpenDocumentInNewWindow_' => 'Aprire',
+ 'UI:DownloadDocument_' => 'Scaricare',
'UI:Document:NoPreview' => 'Non è disponibile un\'anteprima per questo tipo di documento',
'UI:Download-CSV' => 'Download %1$s~~',
'UI:DeadlineMissedBy_duration' => 'Mancati %1$s',
@@ -1134,7 +1124,7 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
'Portal:Title' => 'Portale Utente '.ITOP_APPLICATION_SHORT,
- 'Portal:NoRequestMgmt' => 'Dear %1$s, you have been redirected to this page because your account is configured with the profile \'Portal user\'.Unfortunately, '.ITOP_APPLICATION_SHORT.' has not been installed with the feature \'Request Management\'.Please contact your administrator.~~',
+ 'Portal:NoRequestMgmt' => 'Dear %1$s, you have been redirected to this page because your account is configured with the profile \'Portal user\'. Unfortunately, '.ITOP_APPLICATION_SHORT.' has not been installed with the feature \'Request Management\'. Please contact your administrator.~~',
'Portal:Refresh' => 'Ricarica',
'Portal:Back' => 'Indietro',
'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
@@ -1172,13 +1162,13 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
'UI:ModifyAllPageTitle' => 'Modifica Tutto',
'UI:Modify_ObjectsOf_Class' => 'Modifying objects of class %1$s~~',
'UI:Modify_N_ObjectsOf_Class' => 'Modifica %1$d oggetto della classe %2$s',
- 'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifica %1$d oggetto della classe %2$s fuori da %3$d~~',
+ 'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifica %1$d oggetto della classe %2$s fuori da %3$d',
'UI:Menu:ModifyAll' => 'Modifica...',
'UI:Menu:ModifyAll_Class' => 'Modify %1$s objects...~~',
'UI:Menu:ModifyAll_Link' => 'Modify %1$s...~~',
'UI:Menu:ModifyAll_Remote' => 'Modify %1$s...~~',
'UI:Button:ModifyAll' => 'Modifica tutto',
- 'UI:Button:PreviewModifications' => 'Anteprima Modifiche >>~~',
+ 'UI:Button:PreviewModifications' => 'Anteprima Modifiche >>',
'UI:ModifiedObject' => 'Oggetto Modificato',
'UI:BulkModifyStatus' => 'Operazioni',
'UI:BulkModifyStatus+' => '',
@@ -1190,10 +1180,10 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
'UI:BulkModifyStatusSkipped' => 'Saltato',
'UI:BulkModify_Count_DistinctValues' => '%1$d valori distinti:',
'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d volta(e)',
- 'UI:BulkModify:N_MoreValues' => '%1$d più valori...~~',
+ 'UI:BulkModify:N_MoreValues' => '%1$d più valori...',
'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Tentativo di impostare il campo di sola lettura: %1$s',
'UI:FailedToApplyStimuli' => 'L\'azione non è riuscita.',
- 'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Modifica %2$d oggetti della classe %3$s~~',
+ 'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Modifica %2$d oggetti della classe %3$s',
'UI:CaseLogTypeYourTextHere' => 'Digitare il tuo testo qui:',
'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:~~',
'UI:CaseLog:InitialValue' => 'Valore iniziale:',
@@ -1213,8 +1203,8 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
'UI:ArchiveMode:Banner' => 'Archive mode~~',
'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
'UI:FavoriteOrganizations' => 'Favorite Organizations~~',
- 'UI:FavoriteOrganizations+' => 'Check in the list below the organizations that you want to see in the drop-down menu for a quick access. Note that this is not a security setting, objects from any organization are still visible and can be accessed by selecting \\"All Organizations\\" in the drop-down list.~~',
- 'UI:FavoriteLanguage' => 'Language of the User Interface~~',
+ 'UI:FavoriteOrganizations+' => 'Check in the list below the organizations that you want to see in the drop-down menu for a quick access. Note that this is not a security setting, objects from any organization are still visible and can be accessed by selecting "All Organizations" in the drop-down list.~~',
+ 'UI:FavoriteLanguage' => 'Favorite language~~',
'UI:Favorites:SelectYourLanguage' => 'Select your preferred language~~',
'UI:FavoriteOtherSettings' => 'Other Settings~~',
'UI:Favorites:Default_X_ItemsPerPage' => 'Default length: %1$s items per page~~',
@@ -1222,7 +1212,7 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
'UI:NavigateAwayConfirmationMessage' => 'Any modification will be discarded.~~',
'UI:CancelConfirmationMessage' => 'You will loose your changes. Continue anyway?~~',
- 'UI:AutoApplyConfirmationMessage' => 'Some changes have not been applied yet. Do you want itop to take them into account?~~',
+ 'UI:AutoApplyConfirmationMessage' => 'Some changes have not been applied yet. Do you want '.ITOP_APPLICATION_SHORT.' to take them into account?~~',
'UI:Create_Class_InState' => 'Create the %1$s in state: ~~',
'UI:OrderByHint_Values' => 'Sort order: %1$s~~',
'UI:Menu:AddToDashboard' => 'Add To Dashboard...~~',
@@ -1251,8 +1241,8 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
'UI:ExtField_AsRemoteField' => '%1$s (%2$s)~~',
'UI:Button:MoveUp' => 'Move Up~~',
'UI:Button:MoveDown' => 'Move Down~~',
- 'UI:OQL:UnknownClassAndFix' => 'Unknown class \\"%1$s\\". You may try \\"%2$s\\" instead.~~',
- 'UI:OQL:UnknownClassNoFix' => 'Unknown class \\"%1$s\\"~~',
+ 'UI:OQL:UnknownClassAndFix' => 'Unknown class "%1$s". You may try "%2$s" instead.~~',
+ 'UI:OQL:UnknownClassNoFix' => 'Unknown class "%1$s"~~',
'UI:Dashboard:EditCustom' => 'Edit custom version...~~',
'UI:Dashboard:CreateCustom' => 'Create a custom version...~~',
'UI:Dashboard:DeleteCustom' => 'Delete custom version...~~',
diff --git a/dictionaries/ja.dictionary.itop.core.php b/dictionaries/ja.dictionary.itop.core.php
index e19e757e5..9c4c084da 100644
--- a/dictionaries/ja.dictionary.itop.core.php
+++ b/dictionaries/ja.dictionary.itop.core.php
@@ -159,7 +159,7 @@ Operators:
'Core:FriendlyName-Label' => 'Name',
'Core:FriendlyName-Description' => 'Friendly name',
'Core:AttributeTag' => 'Tags~~',
- 'Core:AttributeTag+' => 'Tags~~',
+ 'Core:AttributeTag+' => '',
'Core:Context=REST/JSON' => 'REST~~',
'Core:Context=Synchro' => 'Synchro~~',
'Core:Context=Setup' => 'Setup~~',
@@ -473,20 +473,24 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:ActionEmail' => 'メール通知',
'Class:ActionEmail+' => '',
- 'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified: just the Test recipient, all (To, cc and Bcc) or no-one~~',
+ 'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified:
+- Being tested: just the Test recipient,
+- In production: all (To, cc and Bcc)
+- Inactive: no-one~~',
'Class:ActionEmail/Attribute:status/Value:test+' => 'Only the Test recipient is notified~~',
'Class:ActionEmail/Attribute:status/Value:enabled+' => 'All To, Cc and Bcc emails are notified~~',
'Class:ActionEmail/Attribute:status/Value:disabled+' => 'The email notification will not be sent~~',
'Class:ActionEmail/Attribute:test_recipient' => 'テストレシピ',
'Class:ActionEmail/Attribute:test_recipient+' => '状態がテストの場合の宛先',
- 'Class:ActionEmail/Attribute:from' => 'From~~',
- 'Class:ActionEmail/Attribute:from+' => '電子メールのヘッダーに挿入されます~~',
+ 'Class:ActionEmail/Attribute:from' => 'From (email)~~',
+ 'Class:ActionEmail/Attribute:from+' => '電子メールのヘッダーに挿入されます',
'Class:ActionEmail/Attribute:from_label' => 'From (label)~~',
- 'Class:ActionEmail/Attribute:from_label+' => 'Sender display name will be sent into the email header~~',
- 'Class:ActionEmail/Attribute:reply_to' => 'Reply to~~',
- 'Class:ActionEmail/Attribute:reply_to+' => '電子メールのヘッダーに挿入されます~~',
+ 'Class:ActionEmail/Attribute:from_label+' => 'Either a static label or a placeholder like $this->agent_id->friendlyname$~~',
+ 'Class:ActionEmail/Attribute:reply_to' => 'Reply to (email)~~',
+ 'Class:ActionEmail/Attribute:reply_to+' => '電子メールのヘッダーに挿入されます',
'Class:ActionEmail/Attribute:reply_to_label' => 'Reply to (label)~~',
- 'Class:ActionEmail/Attribute:reply_to_label+' => 'Reply to display name will be sent into the email header~~',
+ 'Class:ActionEmail/Attribute:reply_to_label+' => 'Either a static label or a placeholder like $this->team_id->friendlyname$.
+If omitted the From (label) is used.~~',
'Class:ActionEmail/Attribute:to' => 'To',
'Class:ActionEmail/Attribute:to+' => 'メールの宛先',
'Class:ActionEmail/Attribute:cc' => 'Cc',
@@ -555,7 +559,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:TriggerOnObject/Attribute:filter' => 'Filter~~',
'Class:TriggerOnObject/Attribute:filter+' => 'Limit the object list (of the target class) which will activate the trigger~~',
'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s~~',
- 'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class \\"%1$s\\"~~',
+ 'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class "%1$s"~~',
));
//
@@ -903,12 +907,12 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Core:Duration_Hours_Minutes_Seconds' => '%1$d時 %2$d分 %3$d秒',
'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$s日 %2$d時 %3$d分 %4$d秒',
// Explain working time computing
- 'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \\"%1$s\\")~~',
- 'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \\"%1$s\\"~~',
- 'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \\"%1$s\\" at %2$d%%~~',
+ 'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as "%1$s")~~',
+ 'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for "%1$s"~~',
+ 'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for "%1$s" at %2$d%%~~',
// Bulk export
- 'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \\"%1$s\\"~~',
- 'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \\"query\\". There is no Query Phrasebook corresponding to the id: \\"%1$s\\".~~',
+ 'Core:BulkExport:MissingParameter_Param' => 'Missing parameter "%1$s"~~',
+ 'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter "query". There is no Query Phrasebook corresponding to the id: "%1$s".~~',
'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
'Core:BulkExportOf_Class' => '%1$s Export~~',
'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s~~',
@@ -1003,13 +1007,13 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:TagSetFieldData/Attribute:label' => 'Label~~',
'Class:TagSetFieldData/Attribute:label+' => 'Displayed label~~',
'Class:TagSetFieldData/Attribute:description' => 'Description~~',
- 'Class:TagSetFieldData/Attribute:description+' => 'Description~~',
+ 'Class:TagSetFieldData/Attribute:description+' => '',
'Class:TagSetFieldData/Attribute:finalclass' => 'Tag class~~',
'Class:TagSetFieldData/Attribute:obj_class' => 'Object class~~',
'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code~~',
'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Used tags cannot be deleted~~',
'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Tags codes or labels must be unique~~',
- 'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters~~',
+ 'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters, starting with a letter.~~',
'Core:TagSetFieldData:ErrorTagCodeReservedWord' => 'The chosen tag code is a reserved word~~',
'Core:TagSetFieldData:ErrorTagLabelSyntax' => 'Tags label must not contain \'%1$s\' nor be empty~~',
'Core:TagSetFieldData:ErrorCodeUpdateNotAllowed' => 'Tags Code cannot be changed when used~~',
diff --git a/dictionaries/ja.dictionary.itop.ui.php b/dictionaries/ja.dictionary.itop.ui.php
index b3acc6d26..0b4989178 100644
--- a/dictionaries/ja.dictionary.itop.ui.php
+++ b/dictionaries/ja.dictionary.itop.ui.php
@@ -356,16 +356,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:UserDashboard/Attribute:contents+' => '~~',
));
-//
-// Expression to Natural language
-//
-Dict::Add('JA JP', 'Japanese', '日本語', array(
- 'Expression:Unit:Short:DAY' => 'd~~',
- 'Expression:Unit:Short:WEEK' => 'w~~',
- 'Expression:Unit:Short:MONTH' => 'm~~',
- 'Expression:Unit:Short:YEAR' => 'y~~',
-));
-
//
// Duplicated into itop-welcome-itil ( will be removed from here...)
//
@@ -439,8 +429,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:WelcomeMenu:MyIncidents' => '担当中のインシデント',
'UI:AllOrganizations' => '全ての組織',
'UI:YourSearch' => '検索',
- 'UI:LoggedAsMessage' => '%1$s としてログイン済み (%2$s)~~',
- 'UI:LoggedAsMessage+Admin' => '%1$s (管理者)としてログイン済み (%2$s)~~',
+ 'UI:LoggedAsMessage' => '%1$s としてログイン済み (%2$s)',
+ 'UI:LoggedAsMessage+Admin' => '%1$s (管理者)としてログイン済み (%2$s)',
'UI:Button:Logoff' => 'ログオフ',
'UI:Button:GlobalSearch' => '検索',
'UI:Button:Search' => ' 検索 ',
@@ -487,7 +477,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:InputFile:NoFileSelected' => 'No File Selected~~',
'UI:InputFile:SelectFile' => 'Select a file~~',
'UI:SearchToggle' => '検索(トグル↓↑)',
- 'UI:ClickToCreateNew' => '新規 %1$s を作成~~',
+ 'UI:ClickToCreateNew' => '新規 %1$s を作成',
'UI:SearchFor_Class' => '%1$s オブジェクトを検索',
'UI:NoObjectToDisplay' => '表示するオブジェクトはありません。',
'UI:Error:SaveFailed' => 'The object cannot be saved :~~',
@@ -607,8 +597,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions. If you receive no email, please check the login you typed.~~',
- 'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
- 'UI:ResetPwd-EmailBody' => 'You have requested to reset your iTop password.
Please follow this link (single usage) to enter a new password
.~~',
+ 'UI:ResetPwd-EmailSubject' => 'Reset your '.ITOP_APPLICATION_SHORT.' password~~',
+ 'UI:ResetPwd-EmailBody' => 'You have requested to reset your '.ITOP_APPLICATION_SHORT.' password.
Please follow this link (single usage) to enter a new password
.~~',
'UI:ResetPwd-Title' => 'Reset password~~',
'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
@@ -698,7 +688,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:UniversalSearch:Error' => 'エラー:%1$s',
'UI:UniversalSearch:LabelSelectTheClass' => '検索するクラスを選択してください。',
'UI:CSVReport-Value-Modified' => '修正済み',
- 'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
+ 'UI:CSVReport-Value-SetIssue' => 'Invalid value for attribute~~',
'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
@@ -782,7 +772,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:Audit:Dashboard:ObjectsAudited' => 'Objects audited~~',
'UI:Audit:Dashboard:ObjectsInError' => 'Objects in errors~~',
'UI:Audit:Dashboard:ObjectsValidated' => 'Objects validated~~',
- 'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%%~~',
+ 'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%% of the object are valid~~',
'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - OQLクエリ評価',
'UI:RunQuery:QueryExamples' => 'クエリの例',
'UI:RunQuery:QueryResults' => 'Query Results~~',
@@ -801,7 +791,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:RunQuery:ResultSQL' => 'Resulting SQL~~',
'UI:RunQuery:Error' => 'An error occured while running the query~~',
'UI:Query:UrlForExcel' => 'MS-Excel Webクエリに使用するURL',
- 'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page export-V2.php cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: export.php. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of '.ITOP_APPLICATION_SHORT.'.Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page export-V2.php.~~',
+ 'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page export-V2.php cannot be invoked without this information. Therefore, the URL suggested here below points to the legacy page: export.php. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of '.ITOP_APPLICATION_SHORT.'.
Should you want to guarantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page export-V2.php.~~',
'UI:Schema:Title' => ITOP_APPLICATION_SHORT.' オブジェクトスキーマ',
'UI:Schema:TitleForClass' => '%1$s schema~~',
'UI:Schema:CategoryMenuItem' => 'カテゴリ %1$s',
@@ -944,8 +934,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:SearchResultsTitle' => '検索結果',
'UI:SearchResultsTitle+' => 'Full-text search results~~',
'UI:Search:NoSearch' => '検索するものがありません。',
- 'UI:Search:NeedleTooShort' => 'The search string \\"%1$s\\" is too short. Please type at least %2$d characters.~~',
- 'UI:Search:Ongoing' => 'Searching for \\"%1$s\\"~~',
+ 'UI:Search:NeedleTooShort' => 'The search string "%1$s" is too short. Please type at least %2$d characters.~~',
+ 'UI:Search:Ongoing' => 'Searching for "%1$s"~~',
'UI:Search:Enlarge' => 'Broaden the search~~',
'UI:FullTextSearchTitle_Text' => '"%1$s"の結果:',
'UI:Search:Count_ObjectsOf_Class_Found' => '%2$sクラスの%1$dオブジェクトが見つかりました。',
@@ -1058,7 +1048,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
実行するには、アクションがトリガーに関連づけられている必要があります。
-トリガーに関連づけられると、各々のアクションは順番が与えられ、どの順序でアクションが実行されるかが指定されます。
~~',
+トリガーに関連づけられると、各々のアクションは順番が与えられ、どの順序でアクションが実行されるかが指定されます。',
'UI:NotificationsMenu:Triggers' => 'トリガー',
'UI:NotificationsMenu:AvailableTriggers' => '利用可能トリガー',
'UI:NotificationsMenu:OnCreate' => 'オブジェクトが作成された時',
@@ -1202,10 +1192,10 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
'UI:FavoriteOrganizations' => 'クイックアクセス組織',
'UI:FavoriteOrganizations+' => '迅速なアクセスのためのドロップダウンメニューに表示したい組織は、以下のリストで確認してください。セキュリティ設定ではないことに注意してください。全ての組織のオブジェクトは、表示可能です。ドロップダウンリストで「すべての組織(All Organizations)」を選択することでアクセスすることができます。',
- 'UI:FavoriteLanguage' => 'ユーザインターフェースの言語~~',
+ 'UI:FavoriteLanguage' => 'ユーザインターフェースの言語',
'UI:Favorites:SelectYourLanguage' => '希望する言語を選択ください。',
'UI:FavoriteOtherSettings' => '他のセッティング',
- 'UI:Favorites:Default_X_ItemsPerPage' => 'リストの規定の長さ: %1$s items 毎ページ~~',
+ 'UI:Favorites:Default_X_ItemsPerPage' => 'リストの規定の長さ: %1$s items 毎ページ',
'UI:Favorites:ShowObsoleteData' => 'Show obsolete data~~',
'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
'UI:NavigateAwayConfirmationMessage' => '全ての変更を破棄します。',
@@ -1649,7 +1639,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Menu:UserAccountsMenu' => 'ユーザアカウント',
'Menu:UserAccountsMenu+' => 'ユーザアカウント',
'Menu:UserAccountsMenu:Title' => 'ユーザアカウント',
- 'Menu:UserManagement' => 'User Management~~',
+ 'Menu:UserManagement' => 'User management~~',
'Menu:Queries' => 'Queries~~',
'Menu:ConfigurationTools' => 'Configuration~~'
));
diff --git a/dictionaries/nl.dictionary.itop.ui.php b/dictionaries/nl.dictionary.itop.ui.php
index ec816e6b1..09ccd68b7 100644
--- a/dictionaries/nl.dictionary.itop.ui.php
+++ b/dictionaries/nl.dictionary.itop.ui.php
@@ -367,16 +367,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:UserDashboard/Attribute:contents+' => '',
));
-//
-// Expression to Natural language
-//
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Expression:Unit:Short:DAY' => 'd',
- 'Expression:Unit:Short:WEEK' => 'w',
- 'Expression:Unit:Short:MONTH' => 'm',
- 'Expression:Unit:Short:YEAR' => 'j',
-));
-
//
// Duplicated into itop-welcome-itil ( will be removed from here...)
//
@@ -709,7 +699,7 @@ We hopen dat je even hard van deze versie geniet als dat we zelf ervan hebben ge
'UI:UniversalSearch:Error' => 'Fout: %1$s',
'UI:UniversalSearch:LabelSelectTheClass' => 'Selecteer de klasse om te zoeken: ',
'UI:CSVReport-Value-Modified' => 'Aangepast',
- 'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
+ 'UI:CSVReport-Value-SetIssue' => 'Invalid value for attribute~~',
'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
diff --git a/dictionaries/pl.dictionary.itop.ui.php b/dictionaries/pl.dictionary.itop.ui.php
index aa5228b67..f5c9838ef 100644
--- a/dictionaries/pl.dictionary.itop.ui.php
+++ b/dictionaries/pl.dictionary.itop.ui.php
@@ -367,16 +367,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
'Class:UserDashboard/Attribute:contents+' => '',
));
-//
-// Expression to Natural language
-//
-Dict::Add('PL PL', 'Polish', 'Polski', array(
- 'Expression:Unit:Short:DAY' => 'd',
- 'Expression:Unit:Short:WEEK' => 'w',
- 'Expression:Unit:Short:MONTH' => 'm',
- 'Expression:Unit:Short:YEAR' => 'y',
-));
-
//
// Duplicated into itop-welcome-itil ( will be removed from here...)
//
diff --git a/dictionaries/pt_br.dictionary.itop.core.php b/dictionaries/pt_br.dictionary.itop.core.php
index 5a38c7a1a..bc85eb4a0 100644
--- a/dictionaries/pt_br.dictionary.itop.core.php
+++ b/dictionaries/pt_br.dictionary.itop.core.php
@@ -28,7 +28,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'Core:UnknownObjectTip' => 'O objeto não pode ser encontrado. Ele pode ter sido eliminado há algum tempo e o log foi removido desde então',
'Core:UniquenessDefaultError' => 'Regra de exclusividade \'%1$s\' com erro',
'Core:CheckConsistencyError' => 'Regras de consistência não seguidas: %1$s',
- 'Core:CheckValueError' => 'Valor inesperado para o atributo \'%1$s\' (%2$s) : %3$s~~',
+ 'Core:CheckValueError' => 'Valor inesperado para o atributo \'%1$s\' (%2$s) : %3$s',
'Core:AttributeLinkedSet' => 'Array de objetos',
'Core:AttributeLinkedSet+' => 'Quaisquer tipos de objetos da mesma classe ou subclasses',
'Core:AttributeLinkedSetDuplicatesFound' => 'Duplicatas no campo \'%1$s\' : %2$s',
@@ -862,8 +862,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'Class:SynchroLog/Attribute:status/Value:completed' => 'Finalizado',
'Class:SynchroLog/Attribute:status/Value:error' => 'Erro',
'Class:SynchroLog/Attribute:status/Value:running' => 'Em execução',
- 'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Número réplica vista~~',
- 'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Número réplica total~~',
+ 'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Número réplica vista',
+ 'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Número réplica total',
'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Número de objeto(s) excluído(s)',
'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Número de erros durante a exclusão',
'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Número de objeto(s) obsoleto(s)',
diff --git a/dictionaries/pt_br.dictionary.itop.ui.php b/dictionaries/pt_br.dictionary.itop.ui.php
index 3d0ba9893..4d26dda8f 100644
--- a/dictionaries/pt_br.dictionary.itop.ui.php
+++ b/dictionaries/pt_br.dictionary.itop.ui.php
@@ -367,16 +367,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'Class:UserDashboard/Attribute:contents+' => '',
));
-//
-// Expression to Natural language
-//
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
- 'Expression:Unit:Short:DAY' => 'd',
- 'Expression:Unit:Short:WEEK' => 's',
- 'Expression:Unit:Short:MONTH' => 'm',
- 'Expression:Unit:Short:YEAR' => 'a',
-));
-
//
// Duplicated into itop-welcome-itil ( will be removed from here...)
//
@@ -709,7 +699,7 @@ Esperamos que você goste desta versão tanto quanto gostamos de imaginá-la e c
'UI:UniversalSearch:Error' => 'Erro: %1$s',
'UI:UniversalSearch:LabelSelectTheClass' => 'Selecione a classe para pesquisar: ',
'UI:CSVReport-Value-Modified' => 'Modificado',
- 'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
+ 'UI:CSVReport-Value-SetIssue' => 'Invalid value for attribute~~',
'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
diff --git a/dictionaries/ru.dictionary.itop.core.php b/dictionaries/ru.dictionary.itop.core.php
index a2adb9837..ebe09af24 100644
--- a/dictionaries/ru.dictionary.itop.core.php
+++ b/dictionaries/ru.dictionary.itop.core.php
@@ -409,13 +409,13 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
//
Dict::Add('RU RU', 'Russian', 'Русский', array(
- 'Class:EventLoginUsage' => 'Статистика авторизаций~~',
+ 'Class:EventLoginUsage' => 'Статистика авторизаций',
'Class:EventLoginUsage+' => 'Connection to the application',
- 'Class:EventLoginUsage/Attribute:user_id' => 'Логин~~',
+ 'Class:EventLoginUsage/Attribute:user_id' => 'Логин',
'Class:EventLoginUsage/Attribute:user_id+' => 'Login',
- 'Class:EventLoginUsage/Attribute:contact_name' => 'Имя пользователя~~',
+ 'Class:EventLoginUsage/Attribute:contact_name' => 'Имя пользователя',
'Class:EventLoginUsage/Attribute:contact_name+' => 'Имя пользователя',
- 'Class:EventLoginUsage/Attribute:contact_email' => 'Email пользователя~~',
+ 'Class:EventLoginUsage/Attribute:contact_email' => 'Email пользователя',
'Class:EventLoginUsage/Attribute:contact_email+' => 'Email Address of the User',
));
@@ -462,20 +462,24 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
Dict::Add('RU RU', 'Russian', 'Русский', array(
'Class:ActionEmail' => 'Уведомление по email',
'Class:ActionEmail+' => '',
- 'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified: just the Test recipient, all (To, cc and Bcc) or no-one~~',
+ 'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified:
+- Being tested: just the Test recipient,
+- In production: all (To, cc and Bcc)
+- Inactive: no-one~~',
'Class:ActionEmail/Attribute:status/Value:test+' => 'Only the Test recipient is notified~~',
'Class:ActionEmail/Attribute:status/Value:enabled+' => 'All To, Cc and Bcc emails are notified~~',
'Class:ActionEmail/Attribute:status/Value:disabled+' => 'The email notification will not be sent~~',
'Class:ActionEmail/Attribute:test_recipient' => 'Тестовый получатель',
'Class:ActionEmail/Attribute:test_recipient+' => 'Получатель, если уведомление в статусе "Тест"',
- 'Class:ActionEmail/Attribute:from' => 'От~~',
- 'Class:ActionEmail/Attribute:from+' => 'Будет отправлено в заголовке email~~',
+ 'Class:ActionEmail/Attribute:from' => 'От',
+ 'Class:ActionEmail/Attribute:from+' => 'Будет отправлено в заголовке email',
'Class:ActionEmail/Attribute:from_label' => 'From (label)~~',
- 'Class:ActionEmail/Attribute:from_label+' => 'Sender display name will be sent into the email header~~',
- 'Class:ActionEmail/Attribute:reply_to' => 'Ответить на~~',
- 'Class:ActionEmail/Attribute:reply_to+' => 'Будет отправлено в заголовке email~~',
+ 'Class:ActionEmail/Attribute:from_label+' => 'Either a static label or a placeholder like $this->agent_id->friendlyname$~~',
+ 'Class:ActionEmail/Attribute:reply_to' => 'Ответить на',
+ 'Class:ActionEmail/Attribute:reply_to+' => 'Будет отправлено в заголовке email',
'Class:ActionEmail/Attribute:reply_to_label' => 'Reply to (label)~~',
- 'Class:ActionEmail/Attribute:reply_to_label+' => 'Reply to display name will be sent into the email header~~',
+ 'Class:ActionEmail/Attribute:reply_to_label+' => 'Either a static label or a placeholder like $this->team_id->friendlyname$.
+If omitted the From (label) is used.~~',
'Class:ActionEmail/Attribute:to' => 'Кому',
'Class:ActionEmail/Attribute:to+' => 'Получатель email',
'Class:ActionEmail/Attribute:cc' => 'Копия',
@@ -739,17 +743,17 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'SynchroDataSource:Reconciliation' => 'Поиск и сопоставление',
'SynchroDataSource:Deletion' => 'Устаревание и удаление',
'SynchroDataSource:Status' => 'Статус',
- 'SynchroDataSource:Information' => 'Инфо~~',
- 'SynchroDataSource:Definition' => 'Определение~~',
+ 'SynchroDataSource:Information' => 'Инфо',
+ 'SynchroDataSource:Definition' => 'Определение',
'Core:SynchroAttributes' => 'Атрибуты',
- 'Core:SynchroStatus' => 'Свойства~~',
- 'Core:Synchro:ErrorsLabel' => 'Ошибки~~',
- 'Core:Synchro:CreatedLabel' => 'Создан~~',
- 'Core:Synchro:ModifiedLabel' => 'Изменен~~',
- 'Core:Synchro:UnchangedLabel' => 'Неизменен~~',
- 'Core:Synchro:ReconciledErrorsLabel' => 'Ошибки~~',
- 'Core:Synchro:ReconciledLabel' => 'Согласован~~',
- 'Core:Synchro:ReconciledNewLabel' => 'Создан~~',
+ 'Core:SynchroStatus' => 'Свойства',
+ 'Core:Synchro:ErrorsLabel' => 'Ошибки',
+ 'Core:Synchro:CreatedLabel' => 'Создан',
+ 'Core:Synchro:ModifiedLabel' => 'Изменен',
+ 'Core:Synchro:UnchangedLabel' => 'Неизменен',
+ 'Core:Synchro:ReconciledErrorsLabel' => 'Ошибки',
+ 'Core:Synchro:ReconciledLabel' => 'Согласован',
+ 'Core:Synchro:ReconciledNewLabel' => 'Создан',
'Core:SynchroReconcile:Yes' => 'Да',
'Core:SynchroReconcile:No' => 'Нет',
'Core:SynchroUpdate:Yes' => 'Да',
@@ -763,21 +767,21 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
// 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_ignored' => 'Игнор. (%1$s)',
+ 'Core:Synchro:label_repl_disappeared' => 'Невид. (%1$s)',
'Core:Synchro:label_repl_existing' => 'Existing (%1$s)~~',
- 'Core:Synchro:label_repl_new' => 'Новый (%1$s)~~',
- 'Core:Synchro:label_obj_deleted' => 'Удаленный (%1$s)~~',
+ 'Core:Synchro:label_repl_new' => 'Новый (%1$s)',
+ 'Core:Synchro:label_obj_deleted' => 'Удаленный (%1$s)',
'Core:Synchro:label_obj_obsoleted' => 'Obsoleted (%1$s)~~',
- 'Core:Synchro:label_obj_disappeared_errors' => 'Ошибки (%1$s)~~',
+ 'Core:Synchro:label_obj_disappeared_errors' => 'Ошибки (%1$s)',
'Core:Synchro:label_obj_disappeared_no_action' => 'No Action (%1$s)~~',
'Core:Synchro:label_obj_unchanged' => 'Unchanged (%1$s)~~',
- 'Core:Synchro:label_obj_updated' => 'Обновлен (%1$s)~~',
- 'Core:Synchro:label_obj_updated_errors' => 'Ошибки (%1$s)~~',
+ 'Core:Synchro:label_obj_updated' => 'Обновлен (%1$s)',
+ 'Core:Synchro:label_obj_updated_errors' => 'Ошибки (%1$s)',
'Core:Synchro:label_obj_new_unchanged' => 'Unchanged (%1$s)~~',
- 'Core:Synchro:label_obj_new_updated' => 'Обновлен (%1$s)~~',
- 'Core:Synchro:label_obj_created' => 'Создан (%1$s)~~',
- 'Core:Synchro:label_obj_new_errors' => 'Ошибки (%1$s)~~',
+ 'Core:Synchro:label_obj_new_updated' => 'Обновлен (%1$s)',
+ 'Core:Synchro:label_obj_created' => 'Создан (%1$s)',
+ 'Core:Synchro:label_obj_new_errors' => 'Ошибки (%1$s)',
'Core:SynchroLogTitle' => '%1$s - %2$s~~',
'Core:Synchro:Nb_Replica' => 'Replica processed: %1$s~~',
'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s~~',
@@ -801,32 +805,32 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Core:SynchroAtt:reconciliation_attcode' => 'Ключ сопоставления',
'Core:SynchroAtt:reconciliation_attcode+' => 'Код атрибута для сопоставления с внешним ключом',
'Core:SyncDataExchangeComment' => '(Синхронизация)',
- 'Core:Synchro:ListOfDataSources' => 'Список данных:~~',
+ 'Core:Synchro:ListOfDataSources' => 'Список данных:',
'Core:Synchro:LastSynchro' => 'Последняя синхронизация:',
'Core:Synchro:ThisObjectIsSynchronized' => 'This object is synchronized with an external data source~~',
'Core:Synchro:TheObjectWasCreatedBy_Source' => 'The object was created by the external data source %1$s~~',
'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'The object can be deleted by the external data source %1$s~~',
'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'You cannot delete the object because it is owned by the external data source %1$s~~',
- 'TitleSynchroExecution' => 'Запуск синхронизаций.~~',
- 'Class:SynchroDataSource:DataTable' => 'Таблица: %1$s~~',
+ 'TitleSynchroExecution' => 'Запуск синхронизаций.',
+ 'Class:SynchroDataSource:DataTable' => 'Таблица: %1$s',
'Core:SyncDataSourceObsolete' => 'The data source is marked as obsolete. Operation cancelled.~~',
- 'Core:SyncDataSourceAccessRestriction' => 'Могут запускать только администраторы и определенные пользователи. Операция отменена.~~',
+ 'Core:SyncDataSourceAccessRestriction' => 'Могут запускать только администраторы и определенные пользователи. Операция отменена.',
'Core:SyncTooManyMissingReplicas' => 'All records have been untouched for some time (all of the objects could be deleted). Please check that the process that writes into the synchronization table is still running. Operation cancelled.~~',
'Core:SyncSplitModeCLIOnly' => 'The synchronization can be executed in chunks only if run in mode CLI~~',
- 'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, Ошибок %2$s, Предупреждений %3$s.~~',
- 'Core:SynchroReplica:TargetObject' => 'Синхронизировано объектов: %1$s~~',
+ 'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, Ошибок %2$s, Предупреждений %3$s.',
+ 'Core:SynchroReplica:TargetObject' => 'Синхронизировано объектов: %1$s',
'Class:AsyncSendEmail' => 'Email (asynchronous)~~',
- 'Class:AsyncSendEmail/Attribute:to' => 'Кому~~',
- 'Class:AsyncSendEmail/Attribute:subject' => 'Получатель~~',
- 'Class:AsyncSendEmail/Attribute:body' => 'Тело~~',
- 'Class:AsyncSendEmail/Attribute:header' => 'Заголовок~~',
+ 'Class:AsyncSendEmail/Attribute:to' => 'Кому',
+ 'Class:AsyncSendEmail/Attribute:subject' => 'Получатель',
+ 'Class:AsyncSendEmail/Attribute:body' => 'Тело',
+ 'Class:AsyncSendEmail/Attribute:header' => 'Заголовок',
'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Шифрованный пароль',
- 'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Предыдущее значение~~',
+ 'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Предыдущее значение',
'Class:CMDBChangeOpSetAttributeEncrypted' => 'Encrypted Field~~',
- 'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Предыдущее значение~~',
+ 'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Предыдущее значение',
'Class:CMDBChangeOpSetAttributeCaseLog' => 'Лог',
'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Посл.значение',
- 'Class:SynchroAttribute' => 'Синх.характеристики~~',
+ 'Class:SynchroAttribute' => 'Синх.характеристики',
'Class:SynchroAttribute/Attribute:sync_source_id' => 'Синхронизация данных',
'Class:SynchroAttribute/Attribute:attcode' => 'Код атрибута',
'Class:SynchroAttribute/Attribute:update' => 'Обновить',
@@ -835,7 +839,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Заблокирован',
'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Разблокирован',
'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Инициализация если пусто',
- 'Class:SynchroAttribute/Attribute:finalclass' => 'Класс~~',
+ 'Class:SynchroAttribute/Attribute:finalclass' => 'Класс',
'Class:SynchroAttExtKey' => 'Synchro Attribute (ExtKey)~~',
'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Атрибут согласования',
'Class:SynchroAttLinkSet' => 'Synchro Attribute (Linkset)~~',
@@ -870,7 +874,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Class:SynchroReplica/Attribute:dest_id' => 'Назначение объекта',
'Class:SynchroReplica/Attribute:dest_class' => 'Назначение типа',
'Class:SynchroReplica/Attribute:status_last_seen' => 'Был виден',
- 'Class:SynchroReplica/Attribute:status' => 'Статус~~',
+ 'Class:SynchroReplica/Attribute:status' => 'Статус',
'Class:SynchroReplica/Attribute:status/Value:modified' => 'Изменен',
'Class:SynchroReplica/Attribute:status/Value:new' => 'Новый',
'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Устаревший',
@@ -885,7 +889,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Class:appUserPreferences/Attribute:userid' => 'Пользователь',
'Class:appUserPreferences/Attribute:preferences' => 'Предпочтения',
'Core:ExecProcess:Code1' => 'Неверная команда или команда завершена с ошибкой (возможно, неверное имя скрипта)',
- 'Core:ExecProcess:Code255' => 'Ошибка PHP (parsing, or runtime)~~',
+ 'Core:ExecProcess:Code255' => 'Ошибка PHP (parsing, or runtime)',
// Attribute Duration
'Core:Duration_Seconds' => '%1$d с',
'Core:Duration_Minutes_Seconds' => '%1$d мин %2$d с',
diff --git a/dictionaries/ru.dictionary.itop.ui.php b/dictionaries/ru.dictionary.itop.ui.php
index 392b293d5..78053fc6c 100644
--- a/dictionaries/ru.dictionary.itop.ui.php
+++ b/dictionaries/ru.dictionary.itop.ui.php
@@ -368,16 +368,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Class:UserDashboard/Attribute:contents+' => '',
));
-//
-// Expression to Natural language
-//
-Dict::Add('RU RU', 'Russian', 'Русский', array(
- 'Expression:Unit:Short:DAY' => 'd',
- 'Expression:Unit:Short:WEEK' => 'w',
- 'Expression:Unit:Short:MONTH' => 'm',
- 'Expression:Unit:Short:YEAR' => 'y',
-));
-
//
// Duplicated into itop-welcome-itil ( will be removed from here...)
//
@@ -547,7 +537,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'UI:History:LastModified_On_By' => 'Последнее изменение %1$s by %2$s.',
'UI:HistoryTab' => 'История',
'UI:NotificationsTab' => 'Оповещения',
- 'UI:History:BulkImports' => 'История~~',
+ 'UI:History:BulkImports' => 'История',
'UI:History:BulkImports+' => 'List of CSV imports (latest import first)',
'UI:History:BulkImportDetails' => 'Changes resulting from the CSV import performed on %1$s (by %2$s)~~',
'UI:History:Date' => 'Дата',
@@ -556,11 +546,11 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'UI:History:User+' => 'Пользователь сделавший изменение',
'UI:History:Changes' => 'Изменения',
'UI:History:Changes+' => 'Изменения, внесенные в объект',
- 'UI:History:StatsCreations' => 'Создан~~',
+ 'UI:History:StatsCreations' => 'Создан',
'UI:History:StatsCreations+' => 'Count of objects created',
- 'UI:History:StatsModifs' => 'Изменен~~',
+ 'UI:History:StatsModifs' => 'Изменен',
'UI:History:StatsModifs+' => 'Count of objects modified',
- 'UI:History:StatsDeletes' => 'Удален~~',
+ 'UI:History:StatsDeletes' => 'Удален',
'UI:History:StatsDeletes+' => 'Count of objects deleted',
'UI:Loading' => 'Загрузка...',
'UI:Menu:Actions' => 'Действия',
@@ -638,8 +628,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'UI:ChangePwdMenu' => 'Изменить пароль...',
'UI:Login:PasswordChanged' => 'Пароль успешно изменён!',
'UI:Login:PasswordNotChanged' => 'Error: Password is the same!~~',
- 'UI:AccessRO-All' => 'Только чтение~~',
- 'UI:AccessRO-Users' => 'Только чтение для конечных пользователей~~',
+ 'UI:AccessRO-All' => 'Только чтение',
+ 'UI:AccessRO-Users' => 'Только чтение для конечных пользователей',
'UI:ApplicationEnvironment' => 'Application environment: %1$s~~',
'UI:Login:RetypePwdDoesNotMatch' => 'Пароли не совпадают',
'UI:Button:Login' => 'Войти',
@@ -710,7 +700,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'UI:UniversalSearch:Error' => 'Ошибка: %1$s',
'UI:UniversalSearch:LabelSelectTheClass' => 'Выбор класса для поиска: ',
'UI:CSVReport-Value-Modified' => 'Изменен',
- 'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
+ 'UI:CSVReport-Value-SetIssue' => 'Invalid value for attribute~~',
'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
@@ -787,14 +777,14 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'UI:Audit:OqlError' => 'OQL Error~~',
'UI:Audit:Error:ValueNA' => 'n/a~~',
'UI:Audit:ErrorIn_Rule' => 'Error in Rule~~',
- 'UI:Audit:ErrorIn_Rule_Reason' => 'OQL ошибка в правиле %1$s: %2$s.~~',
+ 'UI:Audit:ErrorIn_Rule_Reason' => 'OQL ошибка в правиле %1$s: %2$s.',
'UI:Audit:ErrorIn_Category' => 'Error in Category~~',
- 'UI:Audit:ErrorIn_Category_Reason' => 'OQL ошибка в категории %1$s: %2$s.~~',
+ 'UI:Audit:ErrorIn_Category_Reason' => 'OQL ошибка в категории %1$s: %2$s.',
'UI:Audit:AuditErrors' => 'Audit Errors~~',
'UI:Audit:Dashboard:ObjectsAudited' => 'Objects audited~~',
'UI:Audit:Dashboard:ObjectsInError' => 'Objects in errors~~',
'UI:Audit:Dashboard:ObjectsValidated' => 'Objects validated~~',
- 'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%%~~',
+ 'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%% of the object are valid~~',
'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - Оценка запросов OQL',
'UI:RunQuery:QueryExamples' => 'Примеры запросов',
'UI:RunQuery:QueryResults' => 'Результаты запроса',
@@ -916,7 +906,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'UI:Error:CannotDeleteBecauseOfDepencies' => 'Не удалось удалить этот объект, поскольку перед удалением необходимо выполнить некоторые операции вручную (в отношении зависимостей от объекта).',
'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'Не удалось удалить этот объект, поскольку перед удалением необходимо выполнить некоторые операции вручную.',
'UI:Archive_User_OnBehalfOf_User' => '%1$s от имени %2$s',
- 'UI:Delete:Deleted' => 'удален~~',
+ 'UI:Delete:Deleted' => 'удален',
'UI:Delete:AutomaticallyDeleted' => 'автоматически удалён',
'UI:Delete:AutomaticResetOf_Fields' => 'автоматически сброшено поле(я): %1$s',
'UI:Delete:CleaningUpRefencesTo_Object' => 'Удаление всех ссылок на %1$s...',
@@ -926,7 +916,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'UI:Delete:ConfirmDeletionOf_Name' => 'Удаление %1$s',
'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => 'Удаление %1$d объектов класса %2$s',
'UI:Delete:CannotDeleteBecause' => 'Could not be deleted: %1$s~~',
- 'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Should be automaticaly deleted, but this is not feasible: %1$s~~',
+ 'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Should be automatically deleted, but this is not feasible: %1$s~~',
'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Must be deleted manually, but this is not feasible: %1$s~~',
'UI:Delete:WillBeDeletedAutomatically' => 'Будет удалено автоматически',
'UI:Delete:MustBeDeletedManually' => 'Необходимо удалить вручную',
@@ -1069,7 +1059,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
Outgoing webhooks: Allow integration with a third-party application by sending structured data to a defined URL.
-Для выполнения действия связываются с триггерами. При связывании с триггером каждому действию присваивается порядковый номер, который указывает на очерёдность выполнения действий при срабатывании триггера.
~~',
+Для выполнения действия связываются с триггерами. При связывании с триггером каждому действию присваивается порядковый номер, который указывает на очерёдность выполнения действий при срабатывании триггера.
',
'UI:NotificationsMenu:Triggers' => 'Триггеры',
'UI:NotificationsMenu:AvailableTriggers' => 'Доступные триггеры',
'UI:NotificationsMenu:OnCreate' => 'При создании объекта',
@@ -1091,7 +1081,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'UI:OpenDocumentInNewWindow_' => 'Открыть',
'UI:DownloadDocument_' => 'Скачать',
'UI:Document:NoPreview' => 'Предпросмотр документов данного типа недоступен',
- 'UI:Download-CSV' => 'Загрузка %1$s~~',
+ 'UI:Download-CSV' => 'Загрузка %1$s',
'UI:DeadlineMissedBy_duration' => 'Пропущен %1$s',
'UI:Deadline_LessThan1Min' => '< 1 мин',
'UI:Deadline_Minutes' => '%1$d мин',
@@ -1165,7 +1155,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Portal:Attachments' => 'Вложения',
'Portal:AddAttachment' => 'Добавить вложения',
'Portal:RemoveAttachment' => ' Удалить вложения',
- 'Portal:Attachment_No_To_Ticket_Name' => 'Вложение #%1$d to %2$s (%3$s)~~',
+ 'Portal:Attachment_No_To_Ticket_Name' => 'Вложение #%1$d to %2$s (%3$s)',
'Portal:SelectRequestTemplate' => 'Select a template for %1$s~~',
'Enum:Undefined' => 'Не определён',
'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s д %2$s ч %3$s мин %4$s с',
@@ -1190,23 +1180,23 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'UI:BulkModifyStatusSkipped' => 'Пропущен',
'UI:BulkModify_Count_DistinctValues' => '%1$d различных значения:',
'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d раз(а)',
- 'UI:BulkModify:N_MoreValues' => '%1$d дополнительных значения...~~',
+ 'UI:BulkModify:N_MoreValues' => '%1$d дополнительных значения...',
'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Attempting to set the read-only field: %1$s~~',
'UI:FailedToApplyStimuli' => 'Операция не может быть выполнена.',
'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Modifying %2$d objects of class %3$s~~',
'UI:CaseLogTypeYourTextHere' => 'Введите свой текст:',
'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:~~',
'UI:CaseLog:InitialValue' => 'Initial value:~~',
- 'UI:AttemptingToSetASlaveAttribute_Name' => 'The field %1$s is not writable because it is mastered by the data synchronization. Value not set.~~',
+ 'UI:AttemptingToSetASlaveAttribute_Name' => 'The field %1$s (%2$s) is not writable because it is mastered by the data synchronization. Value not set.~~',
'UI:ActionNotAllowed' => 'You are not allowed to perform this action on these objects.~~',
'UI:BulkAction:NoObjectSelected' => 'Please select at least one object to perform this operation~~',
'UI:AttemptingToChangeASlaveAttribute_Name' => 'The field %1$s is not writable because it is mastered by the data synchronization. Value remains unchanged.~~',
'UI:Pagination:HeaderSelection' => 'Всего: %1$s элементов (%2$s элементов выделено).',
'UI:Pagination:HeaderNoSelection' => 'Всего: %1$s элементов',
'UI:Pagination:PageSize' => '%1$s объектов на страницу',
- 'UI:Pagination:PagesLabel' => 'Страницы:~~',
+ 'UI:Pagination:PagesLabel' => 'Страницы:',
'UI:Pagination:All' => 'Все',
- 'UI:HierarchyOf_Class' => 'Иерархия по: %1$s~~',
+ 'UI:HierarchyOf_Class' => 'Иерархия по: %1$s',
'UI:Preferences' => 'Предпочтения',
'UI:ArchiveModeOn' => 'Activate archive mode~~',
'UI:ArchiveModeOff' => 'Deactivate archive mode~~',
diff --git a/dictionaries/sk.dictionary.itop.core.php b/dictionaries/sk.dictionary.itop.core.php
index 37f8f4c0f..cbf7e8a1d 100644
--- a/dictionaries/sk.dictionary.itop.core.php
+++ b/dictionaries/sk.dictionary.itop.core.php
@@ -472,20 +472,24 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:ActionEmail' => 'Emailová notifikácia',
'Class:ActionEmail+' => '',
- 'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified: just the Test recipient, all (To, cc and Bcc) or no-one~~',
+ 'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified:
+- Being tested: just the Test recipient,
+- In production: all (To, cc and Bcc)
+- Inactive: no-one~~',
'Class:ActionEmail/Attribute:status/Value:test+' => 'Only the Test recipient is notified~~',
'Class:ActionEmail/Attribute:status/Value:enabled+' => 'All To, Cc and Bcc emails are notified~~',
'Class:ActionEmail/Attribute:status/Value:disabled+' => 'The email notification will not be sent~~',
'Class:ActionEmail/Attribute:test_recipient' => 'Testovací príjemca',
'Class:ActionEmail/Attribute:test_recipient+' => '',
- 'Class:ActionEmail/Attribute:from' => 'Od~~',
+ 'Class:ActionEmail/Attribute:from' => 'Od',
'Class:ActionEmail/Attribute:from+' => '',
'Class:ActionEmail/Attribute:from_label' => 'From (label)~~',
- 'Class:ActionEmail/Attribute:from_label+' => 'Sender display name will be sent into the email header~~',
- 'Class:ActionEmail/Attribute:reply_to' => 'Odpoveď na~~',
+ 'Class:ActionEmail/Attribute:from_label+' => 'Either a static label or a placeholder like $this->agent_id->friendlyname$~~',
+ 'Class:ActionEmail/Attribute:reply_to' => 'Odpoveď na',
'Class:ActionEmail/Attribute:reply_to+' => '',
'Class:ActionEmail/Attribute:reply_to_label' => 'Reply to (label)~~',
- 'Class:ActionEmail/Attribute:reply_to_label+' => 'Reply to display name will be sent into the email header~~',
+ 'Class:ActionEmail/Attribute:reply_to_label+' => 'Either a static label or a placeholder like $this->team_id->friendlyname$.
+If omitted the From (label) is used.~~',
'Class:ActionEmail/Attribute:to' => 'Komu',
'Class:ActionEmail/Attribute:to+' => '',
'Class:ActionEmail/Attribute:cc' => 'Kópia',
@@ -1003,9 +1007,9 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:TagSetFieldData/Attribute:label+' => 'Displayed label~~',
'Class:TagSetFieldData/Attribute:description' => 'Description~~',
'Class:TagSetFieldData/Attribute:description+' => '',
- 'Class:TagSetFieldData/Attribute:finalclass' => 'Tag class~~~~',
- 'Class:TagSetFieldData/Attribute:obj_class' => 'Object class~~~~',
- 'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code~~~~',
+ 'Class:TagSetFieldData/Attribute:finalclass' => 'Tag class~~',
+ 'Class:TagSetFieldData/Attribute:obj_class' => 'Object class~~',
+ 'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code~~',
'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Used tags cannot be deleted~~',
'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Tags codes or labels must be unique~~',
'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters, starting with a letter.~~',
diff --git a/dictionaries/sk.dictionary.itop.ui.php b/dictionaries/sk.dictionary.itop.ui.php
index a3ce39f43..757976201 100644
--- a/dictionaries/sk.dictionary.itop.ui.php
+++ b/dictionaries/sk.dictionary.itop.ui.php
@@ -13,7 +13,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:AuditCategory/Attribute:definition_set' => 'Definícia nastavená',
'Class:AuditCategory/Attribute:definition_set+' => '',
'Class:AuditCategory/Attribute:rules_list' => 'Pravidlá auditu',
- 'Class:AuditCategory/Attribute:rules_list+' => 'Audit rules for this category~~',
+ 'Class:AuditCategory/Attribute:rules_list+' => 'Audit rules using the object scope of this category~~',
'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Warning threshold~~',
'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Percentage of invalid objects below which the result is a warning (orange)~~',
'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error threshold~~',
@@ -356,16 +356,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:UserDashboard/Attribute:contents+' => '~~',
));
-//
-// Expression to Natural language
-//
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
- 'Expression:Unit:Short:DAY' => 'd~~',
- 'Expression:Unit:Short:WEEK' => 'w~~',
- 'Expression:Unit:Short:MONTH' => 'm~~',
- 'Expression:Unit:Short:YEAR' => 'y~~',
-));
-
//
// Duplicated into itop-welcome-itil ( will be removed from here...)
//
@@ -440,8 +430,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:WelcomeMenu:MyIncidents' => 'Mne priradené incidenty',
'UI:AllOrganizations' => ' Všetky organizácie ',
'UI:YourSearch' => 'Vaše vyhľadávanie',
- 'UI:LoggedAsMessage' => 'Prihlásený ako %1$s (%2$s)~~',
- 'UI:LoggedAsMessage+Admin' => 'Prihlásený ako %1$s (%2$s, Administrátor)~~',
+ 'UI:LoggedAsMessage' => 'Prihlásený ako %1$s (%2$s)',
+ 'UI:LoggedAsMessage+Admin' => 'Prihlásený ako %1$s (%2$s, Administrátor)',
'UI:Button:Logoff' => 'Odhlásenie',
'UI:Button:GlobalSearch' => 'Globálne Vyhľadávanie',
'UI:Button:Search' => ' Vyhľadávanie',
@@ -488,7 +478,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:InputFile:NoFileSelected' => 'No File Selected~~',
'UI:InputFile:SelectFile' => 'Select a file~~',
'UI:SearchToggle' => 'Vyhľadávanie',
- 'UI:ClickToCreateNew' => 'Vytvoriť nové %1$s~~',
+ 'UI:ClickToCreateNew' => 'Vytvoriť nové %1$s',
'UI:SearchFor_Class' => 'Vyhľadávanie pre %1$s objekty',
'UI:NoObjectToDisplay' => 'Žiadny objekt na zobrazenie.',
'UI:Error:SaveFailed' => 'The object cannot be saved :~~',
@@ -699,7 +689,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:UniversalSearch:Error' => 'Chyba: %1$s',
'UI:UniversalSearch:LabelSelectTheClass' => 'Vyberte triedu na vyhľadávanie: ',
'UI:CSVReport-Value-Modified' => 'Upravený',
- 'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
+ 'UI:CSVReport-Value-SetIssue' => 'Invalid value for attribute~~',
'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
@@ -783,7 +773,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:Audit:Dashboard:ObjectsAudited' => 'Objects audited~~',
'UI:Audit:Dashboard:ObjectsInError' => 'Objects in errors~~',
'UI:Audit:Dashboard:ObjectsValidated' => 'Objects validated~~',
- 'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%%~~',
+ 'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%% of the object are valid~~',
'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - Určenie OQL Dopytu',
'UI:RunQuery:QueryExamples' => 'Príklad dopytu',
'UI:RunQuery:QueryResults' => 'Query Results~~',
@@ -862,13 +852,13 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:Schema:LifeCycleAttributeMustChange' => 'Musí sa zmeniť',
'UI:Schema:LifeCycleAttributeMustPrompt' => 'Užívateľ bude vyzvaný aby si zmenil danú hodnotu',
'UI:Schema:LifeCycleEmptyList' => 'Prázdny zoznam',
- 'UI:Schema:ClassFilter' => 'Class:~~~~',
- 'UI:Schema:DisplayLabel' => 'Display:~~~~',
- 'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~~~',
- 'UI:Schema:DisplaySelector/Label' => 'Label~~~~',
- 'UI:Schema:DisplaySelector/Code' => 'Code~~~~',
- 'UI:Schema:Attribute/Filter' => 'Filter~~~~',
- 'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~~~',
+ 'UI:Schema:ClassFilter' => 'Class:~~',
+ 'UI:Schema:DisplayLabel' => 'Display:~~',
+ 'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
+ 'UI:Schema:DisplaySelector/Label' => 'Label~~',
+ 'UI:Schema:DisplaySelector/Code' => 'Code~~',
+ 'UI:Schema:Attribute/Filter' => 'Filter~~',
+ 'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
'UI:Schema:Events' => 'Events~~',
'UI:Schema:Events:Defined' => 'Defined events~~',
'UI:Schema:Events:NoEvent' => 'No event defined~~',
@@ -1061,7 +1051,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
Na vykonanie, akcie musia byť priradené spúštačom.
-Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", špecifikujúce v akej postupnosti budú akcie vykonané.
~~',
+Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", špecifikujúce v akej postupnosti budú akcie vykonané.',
'UI:NotificationsMenu:Triggers' => 'Spúštače',
'UI:NotificationsMenu:AvailableTriggers' => 'Dostupné spúštače',
'UI:NotificationsMenu:OnCreate' => 'Keď je objekt vytvorený',
@@ -1080,8 +1070,8 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
'UI:iTopVersion:Short' => ITOP_APPLICATION_SHORT.' verzia %1$s',
'UI:iTopVersion:Long' => ITOP_APPLICATION_SHORT.' verzia %1$s-%2$s postavená na %3$s',
'UI:PropertiesTab' => 'Vlastnosti',
- 'UI:OpenDocumentInNewWindow_' => 'Otvoriť~~',
- 'UI:DownloadDocument_' => 'Stiahnuť~~',
+ 'UI:OpenDocumentInNewWindow_' => 'Otvoriť',
+ 'UI:DownloadDocument_' => 'Stiahnuť',
'UI:Document:NoPreview' => 'Žiadny náhľad nie je dostupný pre tento typ dokumentu',
'UI:Download-CSV' => 'Stiahnuť %1$s',
'UI:DeadlineMissedBy_duration' => 'Prekročené o %1$s',
@@ -1206,10 +1196,10 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
'UI:FavoriteOrganizations' => 'Obľúbené organizácie',
'UI:FavoriteOrganizations+' => '',
- 'UI:FavoriteLanguage' => 'Jazyk užívateľského rozhrania~~',
+ 'UI:FavoriteLanguage' => 'Jazyk užívateľského rozhrania',
'UI:Favorites:SelectYourLanguage' => 'Vyberte si svoj preferovaný jazyk',
'UI:FavoriteOtherSettings' => 'Iné nastavenia',
- 'UI:Favorites:Default_X_ItemsPerPage' => 'Štandardná dĺžka pre zoznamy: %1$s položiek na stránku~~',
+ 'UI:Favorites:Default_X_ItemsPerPage' => 'Štandardná dĺžka pre zoznamy: %1$s položiek na stránku',
'UI:Favorites:ShowObsoleteData' => 'Show obsolete data~~',
'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
'UI:NavigateAwayConfirmationMessage' => 'Akákoľvek úprava bude zahodená.',
@@ -1653,7 +1643,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Menu:UserAccountsMenu' => 'Užívateľské účty',
'Menu:UserAccountsMenu+' => '',
'Menu:UserAccountsMenu:Title' => 'Užívateľské účty',
- 'Menu:UserManagement' => 'User Management~~',
+ 'Menu:UserManagement' => 'User management~~',
'Menu:Queries' => 'Queries~~',
'Menu:ConfigurationTools' => 'Configuration~~'
));
diff --git a/dictionaries/tr.dictionary.itop.core.php b/dictionaries/tr.dictionary.itop.core.php
index e6e697fcd..62c0f25a7 100644
--- a/dictionaries/tr.dictionary.itop.core.php
+++ b/dictionaries/tr.dictionary.itop.core.php
@@ -120,7 +120,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Core:AttributeDateTime?SmartSearch' => '
Date format:
- %1$ss
+ %1$s
Example: %2$s
@@ -483,20 +483,24 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:ActionEmail' => 'E-posta bildirimi',
'Class:ActionEmail+' => '',
- 'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified: just the Test recipient, all (To, cc and Bcc) or no-one~~',
+ 'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified:
+- Being tested: just the Test recipient,
+- In production: all (To, cc and Bcc)
+- Inactive: no-one~~',
'Class:ActionEmail/Attribute:status/Value:test+' => 'Only the Test recipient is notified~~',
'Class:ActionEmail/Attribute:status/Value:enabled+' => 'All To, Cc and Bcc emails are notified~~',
'Class:ActionEmail/Attribute:status/Value:disabled+' => 'The email notification will not be sent~~',
'Class:ActionEmail/Attribute:test_recipient' => 'Test alıcısı',
'Class:ActionEmail/Attribute:test_recipient+' => 'Durumu "Test" olması durumundaki alıcı',
- 'Class:ActionEmail/Attribute:from' => 'Kimden~~',
- 'Class:ActionEmail/Attribute:from+' => 'e-posta başlığında gönderilecek~~',
+ 'Class:ActionEmail/Attribute:from' => 'Kimden',
+ 'Class:ActionEmail/Attribute:from+' => 'e-posta başlığında gönderilecek',
'Class:ActionEmail/Attribute:from_label' => 'From (label)~~',
- 'Class:ActionEmail/Attribute:from_label+' => 'Sender display name will be sent into the email header~~',
- 'Class:ActionEmail/Attribute:reply_to' => 'Yanıtla~~',
- 'Class:ActionEmail/Attribute:reply_to+' => 'e-posta başlığında gönderilecek~~',
+ 'Class:ActionEmail/Attribute:from_label+' => 'Either a static label or a placeholder like $this->agent_id->friendlyname$~~',
+ 'Class:ActionEmail/Attribute:reply_to' => 'Yanıtla',
+ 'Class:ActionEmail/Attribute:reply_to+' => 'e-posta başlığında gönderilecek',
'Class:ActionEmail/Attribute:reply_to_label' => 'Reply to (label)~~',
- 'Class:ActionEmail/Attribute:reply_to_label+' => 'Reply to display name will be sent into the email header~~',
+ 'Class:ActionEmail/Attribute:reply_to_label+' => 'Either a static label or a placeholder like $this->team_id->friendlyname$.
+If omitted the From (label) is used.~~',
'Class:ActionEmail/Attribute:to' => 'Kime',
'Class:ActionEmail/Attribute:to+' => 'E-posta alıcısı',
'Class:ActionEmail/Attribute:cc' => 'Kopya',
@@ -810,7 +814,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Core:SynchroReplica:PrivateDetails' => 'Özel detaylar',
'Core:SynchroReplica:BackToDataSource' => 'Synchro veri kaynağına geri dön: %1$s',
'Core:SynchroReplica:ListOfReplicas' => 'Replika listesi',
- 'Core:SynchroAttExtKey:ReconciliationById' => 'id (birincil anahtar)~~',
+ 'Core:SynchroAttExtKey:ReconciliationById' => 'id (birincil anahtar)',
'Core:SynchroAtt:attcode' => 'Öznitelik',
'Core:SynchroAtt:attcode+' => 'Nesnenin alanı',
'Core:SynchroAtt:reconciliation' => 'Uzlaşma ?',
@@ -835,7 +839,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Core:SyncTooManyMissingReplicas' => 'Tüm kayıtlar bir süredir dokunulmamıştır (tüm nesneler silinebilir). Lütfen senkronizasyon tablosuna yazan işlemin hala çalıştığını kontrol edin. İşlem iptal edildi.',
'Core:SyncSplitModeCLIOnly' => 'Senkronizasyon parçalı olarak, yalnızca Mode CLI \'de çalıştırıldığında yapılabilir',
'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s Replika,%2$s Hata (lar),%3$s Uyarı (lar).',
- 'Core:SynchroReplica:TargetObject' => 'Senkronize Nesne: %1$s~~',
+ 'Core:SynchroReplica:TargetObject' => 'Senkronize Nesne: %1$s',
'Class:AsyncSendEmail' => 'E-posta (Asenkron)',
'Class:AsyncSendEmail/Attribute:to' => 'Kime',
'Class:AsyncSendEmail/Attribute:subject' => 'Konu',
@@ -1019,7 +1023,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code~~',
'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Used tags cannot be deleted~~',
'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Tags codes or labels must be unique~~',
- 'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters~~',
+ 'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters, starting with a letter.~~',
'Core:TagSetFieldData:ErrorTagCodeReservedWord' => 'The chosen tag code is a reserved word~~',
'Core:TagSetFieldData:ErrorTagLabelSyntax' => 'Tags label must not contain \'%1$s\' nor be empty~~',
'Core:TagSetFieldData:ErrorCodeUpdateNotAllowed' => 'Tags Code cannot be changed when used~~',
diff --git a/dictionaries/tr.dictionary.itop.ui.php b/dictionaries/tr.dictionary.itop.ui.php
index bd371f53b..26f1d74c0 100644
--- a/dictionaries/tr.dictionary.itop.ui.php
+++ b/dictionaries/tr.dictionary.itop.ui.php
@@ -367,16 +367,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:UserDashboard/Attribute:contents+' => '~~',
));
-//
-// Expression to Natural language
-//
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
- 'Expression:Unit:Short:DAY' => 'd~~',
- 'Expression:Unit:Short:WEEK' => 'w~~',
- 'Expression:Unit:Short:MONTH' => 'm~~',
- 'Expression:Unit:Short:YEAR' => 'y~~',
-));
-
//
// Duplicated into itop-welcome-itil ( will be removed from here...)
//
@@ -450,8 +440,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:WelcomeMenu:MyIncidents' => 'Bana atanan hatalar',
'UI:AllOrganizations' => ' Tüm Kurumlar ',
'UI:YourSearch' => 'Arama',
- 'UI:LoggedAsMessage' => '%1$s (%2$s) kullanıcısı ile bağlanıldı~~',
- 'UI:LoggedAsMessage+Admin' => '%1$s (%2$s, Administrator) kullanıcısı ile bağlanıldı~~',
+ 'UI:LoggedAsMessage' => '%1$s (%2$s) kullanıcısı ile bağlanıldı',
+ 'UI:LoggedAsMessage+Admin' => '%1$s (%2$s, Administrator) kullanıcısı ile bağlanıldı',
'UI:Button:Logoff' => 'Çıkış',
'UI:Button:GlobalSearch' => 'Arama',
'UI:Button:Search' => ' Arama ',
@@ -498,7 +488,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:InputFile:NoFileSelected' => 'No File Selected~~',
'UI:InputFile:SelectFile' => 'Select a file~~',
'UI:SearchToggle' => 'Ara',
- 'UI:ClickToCreateNew' => 'Yeni %1$s yarat~~',
+ 'UI:ClickToCreateNew' => 'Yeni %1$s yarat',
'UI:SearchFor_Class' => '%1$s Arama',
'UI:NoObjectToDisplay' => 'Görüntülenecek nesne bulunamadı.',
'UI:Error:SaveFailed' => 'The object cannot be saved :~~',
@@ -709,7 +699,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:UniversalSearch:Error' => 'Hata: %1$s',
'UI:UniversalSearch:LabelSelectTheClass' => 'Aranacak sınıfı seçiniz: ',
'UI:CSVReport-Value-Modified' => 'Değiştiridi',
- 'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
+ 'UI:CSVReport-Value-SetIssue' => 'Invalid value for attribute~~',
'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
@@ -722,7 +712,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:CSVReport-Row-Created' => 'Yaratıldı',
'UI:CSVReport-Row-Updated' => '%1$d sütunları güncellendi',
'UI:CSVReport-Row-Disappeared' => '%1$d sütunları ortadan kayboldu',
- 'UI:CSVReport-Row-Issue' => 'Sorun: %1$s~~',
+ 'UI:CSVReport-Row-Issue' => 'Sorun: %1$s',
'UI:CSVReport-Value-Issue-Null' => 'Boş değere izin verilmez',
'UI:CSVReport-Value-Issue-NotFound' => 'Nesne bulunamadı',
'UI:CSVReport-Value-Issue-FoundMany' => '%1$d eşleşme bulundu',
@@ -749,7 +739,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:CSVReport-Object-Created' => 'Nesne oluşturuldu',
'UI:CSVReport-Icon-Error' => 'Hata',
'UI:CSVReport-Object-Error' => 'HATA: %1$s',
- 'UI:CSVReport-Object-Ambiguous' => 'BELIRSIZ: %1$s~~',
+ 'UI:CSVReport-Object-Ambiguous' => 'BELIRSIZ: %1$s',
'UI:CSVReport-Stats-Errors' => '%1$.0f yüklü nesnelerin %% hataları var ve göz ardı edilecek.',
'UI:CSVReport-Stats-Created' => 'Yüklenen nesnelerin %1$.0f %% oluşturulacaktır.',
'UI:CSVReport-Stats-Modified' => 'Yüklenen nesnelerin %1$.0f %% değiştirilecektir.',
@@ -793,7 +783,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:Audit:Dashboard:ObjectsAudited' => 'Objects audited~~',
'UI:Audit:Dashboard:ObjectsInError' => 'Objects in errors~~',
'UI:Audit:Dashboard:ObjectsValidated' => 'Objects validated~~',
- 'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%%~~',
+ 'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%% of the object are valid~~',
'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - OQL Sorgu değerlendirme',
'UI:RunQuery:QueryExamples' => 'Sorgu örnekleri',
'UI:RunQuery:QueryResults' => 'Query Results~~',
@@ -1069,7 +1059,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
İşlemin gerçekleşmesi için bir tetikleme ile ilişkilendirilmesi gerekir.
-Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçekleştirilir.
~~',
+Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçekleştirilir.',
'UI:NotificationsMenu:Triggers' => 'Tetikleyiciler',
'UI:NotificationsMenu:AvailableTriggers' => 'Kullanılabilir tetikleyiciler',
'UI:NotificationsMenu:OnCreate' => 'Nesne yaratıldığında',
@@ -1088,8 +1078,8 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
'UI:iTopVersion:Short' => '%1$s versiyonu %2$s',
'UI:iTopVersion:Long' => '%1$s %4$s tarihli versiyonu %2$s-%3$s',
'UI:PropertiesTab' => 'Özellikler',
- 'UI:OpenDocumentInNewWindow_' => 'Açmak~~',
- 'UI:DownloadDocument_' => 'Indirmek~~',
+ 'UI:OpenDocumentInNewWindow_' => 'Açmak',
+ 'UI:DownloadDocument_' => 'Indirmek',
'UI:Document:NoPreview' => 'Bu tip doküman için öngösterim mevcut değil',
'UI:Download-CSV' => 'İndir %1$s',
'UI:DeadlineMissedBy_duration' => '%1$s ile kaçırıldı',
@@ -1191,7 +1181,7 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
'UI:BulkModify_Count_DistinctValues' => '%1$d belirgin değerler:',
'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d Zaman (lar)',
'UI:BulkModify:N_MoreValues' => '%1$d Diğer değerler...',
- 'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Salt okunur alanını ayarlamaya çalışıyor: %1$s~~',
+ 'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Salt okunur alanını ayarlamaya çalışıyor: %1$s',
'UI:FailedToApplyStimuli' => 'Eylem başarısız oldu',
'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: %2$d Nesnelerin %3$s',
'UI:CaseLogTypeYourTextHere' => 'Metninizi buraya yazın:',
@@ -1251,8 +1241,8 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
'UI:Button:MoveUp' => 'Yukarıya taşı',
'UI:Button:MoveDown' => 'Aşağıya taşı',
- 'UI:OQL:UnknownClassAndFix' => 'Bilinmeyen sınıf \\"%1$s\\". Bunun yerine \\"%2$s\\" deneyebilirsiniz.',
- 'UI:OQL:UnknownClassNoFix' => 'Bilinmeyen sınıf \\"%1$s\\"~~',
+ 'UI:OQL:UnknownClassAndFix' => 'Bilinmeyen sınıf "%1$s". Bunun yerine "%2$s" deneyebilirsiniz.',
+ 'UI:OQL:UnknownClassNoFix' => 'Bilinmeyen sınıf "%1$s"',
'UI:Dashboard:EditCustom' => 'Bu sayfayı düzenleyin...',
'UI:Dashboard:CreateCustom' => 'Create a custom version...~~',
'UI:Dashboard:DeleteCustom' => 'Delete custom version...~~',
@@ -1309,8 +1299,8 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => '%1$s için haftanın günü,',
'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (saat)',
'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (ay)',
- 'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (hafta Günü)~~',
- 'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (ayın günü)~~',
+ 'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (hafta Günü)',
+ 'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (ayın günü)',
'UI:DashletGroupBy:MissingGroupBy' => 'Lütfen nesnelerin birlikte gruplandırılacağı alanı seçin',
'UI:DashletGroupByPie:Label' => 'Pasta grafiği',
'UI:DashletGroupByPie:Description' => 'Pasta grafiği',
@@ -1642,7 +1632,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Menu:DataSources' => 'Synchronization Data Sources~~',
- 'Menu:DataSources+' => 'All Synchronization Data Sources~~',
+ 'Menu:DataSources+' => 'Data synchro used for batch import of external data~~',
'Menu:AuditCategories' => 'Denetleme Kategorileri',
'Menu:AuditCategories+' => 'Denetleme Kategorileri',
'Menu:Notifications:Title' => 'Denetleme Kategorileri',
@@ -1650,7 +1640,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Menu:RunQueriesMenu' => 'Sorgu çalıştır',
'Menu:RunQueriesMenu+' => 'Sorgu çalıştır',
'Menu:QueryMenu' => 'Query phrasebook~~',
- 'Menu:QueryMenu+' => 'Query phrasebook~~',
+ 'Menu:QueryMenu+' => 'Reusable stored queries~~',
'Menu:UniversalSearchMenu' => 'Genel sorgu',
'Menu:UniversalSearchMenu+' => 'Herhangi bir arama...',
'Menu:UserManagementMenu' => 'Kullanıcı Yönetimi',
@@ -1661,7 +1651,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Menu:UserAccountsMenu' => 'Kullanıcı Hesapları',
'Menu:UserAccountsMenu+' => 'Kullanıcı Hesapları',
'Menu:UserAccountsMenu:Title' => 'Kullanıcı Hesapları',
- 'Menu:UserManagement' => 'User Management~~',
+ 'Menu:UserManagement' => 'User management~~',
'Menu:Queries' => 'Queries~~',
'Menu:ConfigurationTools' => 'Configuration~~'
));
diff --git a/dictionaries/zh_cn.dictionary.itop.core.php b/dictionaries/zh_cn.dictionary.itop.core.php
index c5a6b53bb..62dbfb43c 100644
--- a/dictionaries/zh_cn.dictionary.itop.core.php
+++ b/dictionaries/zh_cn.dictionary.itop.core.php
@@ -420,7 +420,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Class:EventIssue/Attribute:arguments_get' => 'URL参数',
'Class:EventIssue/Attribute:arguments_get+' => 'HTTP GET参数',
'Class:EventIssue/Attribute:callstack' => '调用栈',
- 'Class:EventIssue/Attribute:callstack+' => 'Call stack~~',
+ 'Class:EventIssue/Attribute:callstack+' => '',
'Class:EventIssue/Attribute:data' => '数据',
'Class:EventIssue/Attribute:data+' => '更多信息',
));
@@ -1060,9 +1060,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Class:TagSetFieldData/Attribute:label+' => '显示的标签',
'Class:TagSetFieldData/Attribute:description' => '描述',
'Class:TagSetFieldData/Attribute:description+' => '描述',
- 'Class:TagSetFieldData/Attribute:finalclass' => 'Tag class~~~~',
- 'Class:TagSetFieldData/Attribute:obj_class' => 'Object class~~~~',
- 'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code~~~~',
+ 'Class:TagSetFieldData/Attribute:finalclass' => 'Tag class~~',
+ 'Class:TagSetFieldData/Attribute:obj_class' => 'Object class~~',
+ 'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code~~',
'Core:TagSetFieldData:ErrorDeleteUsedTag' => '已使用的标签无法删除',
'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Tags codes or labels must be unique~~',
diff --git a/dictionaries/zh_cn.dictionary.itop.ui.php b/dictionaries/zh_cn.dictionary.itop.ui.php
index 67519ab4e..e60e91e7d 100644
--- a/dictionaries/zh_cn.dictionary.itop.ui.php
+++ b/dictionaries/zh_cn.dictionary.itop.ui.php
@@ -31,12 +31,12 @@ It groups all audit rules applying to that object scope~~',
'Class:AuditCategory/Attribute:definition_set+' => '定义用于审计的对象的OQL表达式',
'Class:AuditCategory/Attribute:rules_list' => '审计规则',
'Class:AuditCategory/Attribute:rules_list+' => '此类别的审计规则',
- 'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Error tolerance (OK)~~',
- 'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Allowed percentage of invalid objects at which the result is still displayed as OK (green)~~',
- 'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error tolerance (warning)~~',
- 'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Allowed percentage of invalid objects at which the result is still displayed as a warning (orange)~~',
+ 'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Warning threshold~~',
+ 'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Percentage of invalid objects below which the result is a warning (orange)~~',
+ 'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error threshold~~',
+ 'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Percentage of invalid objects below which the result is in error (red)~~',
'Class:AuditCategory/Attribute:domains_list' => 'Domains~~',
- 'Class:AuditCategory/Attribute:domains_list+' => 'List of domains linked to this category~~',
+ 'Class:AuditCategory/Attribute:domains_list+' => 'Domains which includes this category~~',
));
//
@@ -82,7 +82,7 @@ Domain usually correspond to who is responsible for checking and fixing errors~~
'Class:AuditDomain/Attribute:icon' => '图标',
'Class:AuditDomain/Attribute:icon+' => '',
'Class:AuditDomain/Attribute:categories_list' => '类别',
- 'Class:AuditDomain/Attribute:categories_list+' => 'Linked audit categories~~',
+ 'Class:AuditDomain/Attribute:categories_list+' => 'Related audit categories. When running the audit on a domain, all related audit categories are checked and only those.~~',
));
//
@@ -128,7 +128,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Query:baseinfo' => '基本信息',
'Query:exportInfo' => '导出信息',
'Class:QueryOQL/Attribute:fields' => '区域',
- 'Class:QueryOQL/Attribute:fields+' => '属性之间使用逗号分隔 (or alias.attribute) to export~~',
+ 'Class:QueryOQL/Attribute:fields+' => '属性之间使用逗号分隔 (or alias.attribute) to export',
'Class:QueryOQL' => 'OQL查询',
'Class:QueryOQL+' => '一种基于对象查询的语言',
'Class:QueryOQL/Attribute:oql' => '表达式',
@@ -374,16 +374,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Class:UserDashboard/Attribute:contents+' => '',
));
-//
-// Expression to Natural language
-//
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
- 'Expression:Unit:Short:DAY' => '日',
- 'Expression:Unit:Short:WEEK' => '周',
- 'Expression:Unit:Short:MONTH' => '月',
- 'Expression:Unit:Short:YEAR' => '年',
-));
-
//
// Duplicated into itop-welcome-itil ( will be removed from here...)
//
@@ -729,7 +719,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'UI:UniversalSearch:LabelSelectTheClass' => '选择要搜索的类别: ',
'UI:CSVReport-Value-Modified' => '已修改',
- 'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
+ 'UI:CSVReport-Value-SetIssue' => 'Invalid value for attribute~~',
'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
@@ -779,7 +769,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'UI:CSVExport:AdvancedMode' => '高级模式',
'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.~~',
'UI:CSVExport:LostChars' => '编码问题',
- 'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').~~',
+ 'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. '.ITOP_APPLICATION_SHORT.' has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').~~',
'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - CMDB 审计',
@@ -1108,7 +1098,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
若要执行, 操作必须和触发器相关联.
-当与一个触发器关联时, 每个操作都被赋予一个顺序号, 规定了按什么样的顺序执行这些操作.
~~',
+当与一个触发器关联时, 每个操作都被赋予一个顺序号, 规定了按什么样的顺序执行这些操作.',
'UI:NotificationsMenu:Triggers' => '触发器',
'UI:NotificationsMenu:AvailableTriggers' => '可用的触发器',
'UI:NotificationsMenu:OnCreate' => '当对象被创建',
diff --git a/setup/runtimeenv.class.inc.php b/setup/runtimeenv.class.inc.php
index 439524e19..7f7a93b40 100644
--- a/setup/runtimeenv.class.inc.php
+++ b/setup/runtimeenv.class.inc.php
@@ -1081,13 +1081,14 @@ class RunTimeEnvironment
SetupUtils::tidydir(APPROOT.'env-'.$this->sTargetEnv);
}
}
-
- /**
- * Call the given handler method for all selected modules having an installation handler
- * @param array[] $aAvailableModules
- * @param string[] $aSelectedModules
- * @param string $sHandlerName
- */
+
+ /**
+ * Call the given handler method for all selected modules having an installation handler
+ * @param array[] $aAvailableModules
+ * @param string[] $aSelectedModules
+ * @param string $sHandlerName
+ * @throws CoreException
+ */
public function CallInstallerHandlers($aAvailableModules, $aSelectedModules, $sHandlerName)
{
foreach($aAvailableModules as $sModuleId => $aModule)
@@ -1100,8 +1101,20 @@ class RunTimeEnvironment
$aCallSpec = array($sModuleInstallerClass, $sHandlerName);
if (is_callable($aCallSpec))
{
- call_user_func_array($aCallSpec, array(MetaModel::GetConfig(), $aModule['version_db'], $aModule['version_code']));
- }
+ try {
+ call_user_func_array($aCallSpec, array(MetaModel::GetConfig(), $aModule['version_db'], $aModule['version_code']));
+ } catch (Exception $e) {
+ $sErrorMessage = "Module $sModuleId : error when calling module installer class $sModuleInstallerClass for $sHandlerName handler";
+ $aExceptionContextData = [
+ 'ModulelId' => $sModuleId,
+ 'ModuleInstallerClass' => $sModuleInstallerClass,
+ 'ModuleInstallerHandler' => $sHandlerName,
+ 'ExceptionClass' => get_class($e),
+ 'ExceptionMessage' => $e->getMessage(),
+ ];
+ throw new CoreException($sErrorMessage, $aExceptionContextData, '', $e);
+ }
+ }
}
}
}
diff --git a/synchro/synchro_import.php b/synchro/synchro_import.php
index e7588587d..14a02a7df 100644
--- a/synchro/synchro_import.php
+++ b/synchro/synchro_import.php
@@ -464,6 +464,8 @@ try
$aIsBinaryToTransform = array();
foreach ($aInputColumns as $iFieldId => $sInputColumn)
{
+ $aIsBinaryToTransform[$iFieldId] = false;
+
if (array_key_exists($sInputColumn, $aDateColumns))
{
$aIsDateToTransform[$iFieldId] = $aDateColumns[$sInputColumn]; // either DATE or DATETIME
@@ -484,7 +486,8 @@ try
{
throw new ExchangeException("Unknown column '$sInputColumn' (class: '$sClass')");
}
- $aIsBinaryToTransform[$iFieldId] = $aColumns[$sInputColumn] === 'LONGBLOB';
+
+ $aIsBinaryToTransform[$iFieldId] = ($aColumns[$sInputColumn] === 'LONGBLOB');
}
if (!isset($iPrimaryKeyCol))
{
diff --git a/tests/php-unit-tests/README.md b/tests/php-unit-tests/README.md
index 22ceaec3b..fb3f48fdb 100644
--- a/tests/php-unit-tests/README.md
+++ b/tests/php-unit-tests/README.md
@@ -7,7 +7,6 @@
- Covers the consistency of some data through the app?
- Most likely in "integration-tests".
-
## Tests prerequisites
Install iTop with default setup options :
@@ -20,7 +19,13 @@ Plus :
- Additional ITIL tickets : check Known Errors Management and FAQ
-## How do I make sure that my tests are efficient?
+## What about skipped tests ?
+A test can be marked as skipped by using the `markTestAsSkipped()` PHPUnit method. Please use it only for temporary disabled tests, for example the ones that are pushed before their corresponding fix.
+
+For other cases like non-relevant data provider cases, just mark the test valid with `assertTrue(true)` and `return`.
+
+
+## How do I make sure that my tests are efficient? (performences)
### Derive from the relevant test class
diff --git a/tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php b/tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
index 8d3d29060..e0bbc2a81 100644
--- a/tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
+++ b/tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
@@ -16,6 +16,10 @@
namespace Combodo\iTop\Test\UnitTest\Integration;
use Combodo\iTop\Test\UnitTest\ItopTestCase;
+use Error;
+use Exception;
+use const ARRAY_FILTER_USE_BOTH;
+use const DIRECTORY_SEPARATOR;
/**
@@ -26,11 +30,54 @@ use Combodo\iTop\Test\UnitTest\ItopTestCase;
*/
class Dict
{
+ /**
+ * @var bool if true will keep entries in {@see m_aData}
+ */
+ private static $bLoadEntries = false;
+
+ private static $bSaveKeyDuplicates = false;
+
+ /**
+ * @var array same as the real Dict class : language code as key, value containing array of dict key / label
+ */
+ public static $m_aData = [];
+
+ public static $aKeysDuplicate = [];
+
+ public static $sLastAddedLanguageCode = null;
+
+ public static function EnableLoadEntries(bool $bSaveKeyDuplicates = false) :void {
+ self::$sLastAddedLanguageCode = null;
+ self::$m_aData = [];
+ self::$aKeysDuplicate = [];
+ self::$bLoadEntries = true;
+ self::$bSaveKeyDuplicates = $bSaveKeyDuplicates;
+ }
+
public static function Add($sLanguageCode, $sEnglishLanguageDesc, $sLocalizedLanguageDesc, $aEntries)
{
+ if (false === static::$bLoadEntries) {
+ return;
+ }
+
+ static::$sLastAddedLanguageCode = $sLanguageCode;
+ foreach ($aEntries as $sDictKey => $sDictLabel) {
+ if (self::$bSaveKeyDuplicates) {
+ if (isset(static::$m_aData[$sLanguageCode][$sDictKey])) {
+ if (array_key_exists($sDictKey, self::$aKeysDuplicate)) {
+ self::$aKeysDuplicate[$sDictKey]++;
+ } else {
+ self::$aKeysDuplicate[$sDictKey] = 1;
+ }
+ }
+ }
+ static::$m_aData[$sLanguageCode][$sDictKey] = $sDictLabel;
+ }
}
}
+
+
/**
* For tests on compiled dict files, see {@see CompiledDictionariesConsistencyTest}
* @group beforeSetup
@@ -152,23 +199,35 @@ class DictionariesConsistencyTest extends ItopTestCase
$this->CheckDictionarySyntax(__DIR__.'/dictionaries-test/fr.dictionary.itop.core.OK.php', true);
}
- /**
- * @param string $sDictFile complete path for the file to check
- * @param bool $bIsSyntaxValid expected assert value
- */
- private function CheckDictionarySyntax(string $sDictFile, $bIsSyntaxValid = true): void
- {
+ private function GetPhpCodeFromDictFile(string $sDictFile) : string {
$sPHP = file_get_contents($sDictFile);
// Strip php tag to allow "eval"
$sPHP = substr(trim($sPHP), strlen(' 'ITOP_APPLICATION_SHORT - CMDB Audit',`
+ // which should be `'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - CMDB Audit',`
+ // Also we are replacing with - instead of _ as ITOP_APPLICATION_SHORT contains ITOP_APPLICATION and we don't want this replacement to occur
$sPHP = str_replace(
['ITOP_APPLICATION_SHORT', 'ITOP_APPLICATION', 'ITOP_VERSION_NAME'],
- ['\'itop\'', '\'itop\'', '\'1.2.3\''],
+ ['\'CONST__ITOP-APPLICATION-SHORT\'', '\'CONST__ITOP-APPLICATION\'', '\'CONST__ITOP-VERSION-NAME\''],
$sPHP
);
+
+ return $sPHP;
+ }
+
+ /**
+ * @param string $sDictFile complete path for the file to check
+ * @param bool $bIsSyntaxValid expected assert value
+ */
+ private function CheckDictionarySyntax(string $sDictFile, bool $bIsSyntaxValid = true): void
+ {
+ $sPHP = $this->GetPhpCodeFromDictFile($sDictFile);
+ $iLineShift = 1; // Cope with the shift due to the namespace statement added in GetPhpCodeFromDictFile
+
try {
eval($sPHP);
// Reaching this point => No syntax error
@@ -176,13 +235,13 @@ class DictionariesConsistencyTest extends ItopTestCase
$this->fail("Failed to detect syntax error in dictionary `{$sDictFile}` (which is known as being INCORRECT)");
}
}
- catch (\Error $e) {
+ catch (Error $e) {
if ($bIsSyntaxValid) {
$iLine = $e->getLine() - $iLineShift;
$this->fail("Invalid dictionary: {$e->getMessage()} in {$sDictFile}:{$iLine}");
}
}
- catch (\Exception $e) {
+ catch (Exception $e) {
if ($bIsSyntaxValid) {
$iLine = $e->getLine() - $iLineShift;
$sExceptionClass = get_class($e);
@@ -270,4 +329,139 @@ EOF
'templates-base',
];
}
+
+ /**
+ * @dataProvider DictionaryFileProvider
+ */
+ public function testDictKeyDefinedOncePerFile(string $sDictFileToTestFullPath): void {
+ Dict::EnableLoadEntries(true);
+
+ $sDictFileToTestPhp = $this->GetPhpCodeFromDictFile($sDictFileToTestFullPath);
+ eval($sDictFileToTestPhp);
+
+ $aDictKeysDefinedMultipleTimes = [];
+ foreach (Dict::$aKeysDuplicate as $sDictKey => $iNumberOfDuplicates) {
+ $sFirstKeyDeclaration = $this->FindDictKeyLineNumberInContent($sDictFileToTestPhp, $sDictKey);
+ $aDictKeysDefinedMultipleTimes[$sDictKey] = $this->MakeFilePathClickable($sDictFileToTestFullPath, $sFirstKeyDeclaration);
+ }
+ $this->assertEmpty(Dict::$aKeysDuplicate, 'Some keys are defined multiple times in this file:'.var_export($aDictKeysDefinedMultipleTimes, true));
+ }
+
+ /**
+ * @dataProvider DictionaryFileProvider
+ */
+ public function testNoRemainingTildesInTranslatedKeys(string $sDictFileToTestFullPath): void
+ {
+ Dict::EnableLoadEntries();
+ $sReferenceLangCode = 'EN US';
+ $sReferenceDictName = 'en';
+
+
+ $sDictFileToTestPhp = $this->GetPhpCodeFromDictFile($sDictFileToTestFullPath);
+ eval($sDictFileToTestPhp);
+
+ $sLanguageCodeToTest = Dict::$sLastAddedLanguageCode;
+ if (is_null($sLanguageCodeToTest)) {
+ $this->assertTrue(true, 'No Dict::Add call in this file !');
+ return;
+ }
+ if ($sLanguageCodeToTest === $sReferenceLangCode) {
+ $this->assertTrue(true, 'Not testing reference lang !');
+ return;
+ }
+ if (empty(Dict::$m_aData[$sLanguageCodeToTest])) {
+ $this->assertTrue(true, 'No Dict key defined in this file !');
+ return;
+ }
+
+ $oDictFileToTestInfo = pathinfo($sDictFileToTestFullPath);
+ $sDictFilesDir = $oDictFileToTestInfo['dirname'];
+ $sDictFileToTestFilename = $oDictFileToTestInfo['basename'];
+ $sDictFileReferenceFilename = preg_replace('/^[^.]*./', $sReferenceDictName.'.', $sDictFileToTestFilename);
+ $sDictFileReferenceFullPath = $sDictFilesDir.DIRECTORY_SEPARATOR.$sDictFileReferenceFilename;
+ $sDictFileReferencePhp = $this->GetPhpCodeFromDictFile($sDictFileReferenceFullPath);
+ eval($sDictFileReferencePhp);
+ if (empty(Dict::$m_aData[$sReferenceLangCode])) {
+ $this->assertTrue(true, 'No Dict key defined in the reference file !');
+ return;
+ }
+
+ $aLangToTestDictEntries = Dict::$m_aData[$sLanguageCodeToTest];
+ $aReferenceLangDictEntries = Dict::$m_aData[$sReferenceLangCode];
+
+
+ $this->assertGreaterThan(0, count($aLangToTestDictEntries), 'There should be at least one entry in the dictionary file to test');
+ $aLangToTestDictEntriesNotEmptyValues = array_filter(
+ $aLangToTestDictEntries,
+ static function ($value, $key) {
+ return !empty($value);
+ },
+ ARRAY_FILTER_USE_BOTH
+ );
+ $this->assertNotEmpty($aLangToTestDictEntriesNotEmptyValues);
+
+
+ $aTranslatedKeysWithTildes = [];
+ foreach ($aReferenceLangDictEntries as $sDictKey => $sReferenceLangLabel) {
+ if (false === array_key_exists($sDictKey, $aLangToTestDictEntries)) {
+ continue;
+ }
+
+ $sTranslatedLabel = $aLangToTestDictEntries[$sDictKey];
+
+ $bTranslatedLabelHasTildes = preg_match('/~~$/', $sTranslatedLabel) === 1;
+ if (false === $bTranslatedLabelHasTildes) {
+ continue;
+ }
+
+ $sTranslatedLabelWithoutTildes = preg_replace('/~~$/', '', $sTranslatedLabel);
+ if ($sTranslatedLabelWithoutTildes === '') {
+ continue;
+ }
+
+ if ($sTranslatedLabelWithoutTildes === $sReferenceLangLabel) {
+ continue;
+ }
+
+ $sDictKeyLineNumberInDictFileToTest = $this->FindDictKeyLineNumberInContent($sDictFileToTestPhp, $sDictKey);
+ $sDictKeyLineNumberInDictFileReference = $this->FindDictKeyLineNumberInContent($sDictFileReferencePhp, $sDictKey);
+ $aTranslatedKeysWithTildes[$sDictKey] = [
+ $sLanguageCodeToTest.'_file_location' => $this->MakeFilePathClickable($sDictFileToTestFullPath, $sDictKeyLineNumberInDictFileToTest),
+ $sLanguageCodeToTest => $sTranslatedLabel,
+ $sReferenceLangCode.'_file_location' => $this->MakeFilePathClickable($sDictFileReferenceFullPath, $sDictKeyLineNumberInDictFileReference),
+ $sReferenceLangCode => $sReferenceLangLabel
+ ];
+ }
+
+ $sPathRoot = static::GetAppRoot();
+ $sDictFileToTestRelativePath = str_replace($sPathRoot, '', $sDictFileToTestFullPath);
+ $this->assertEmpty($aTranslatedKeysWithTildes, "In {$sDictFileToTestRelativePath} \n following keys are different from their '{$sReferenceDictName}' counterpart (translated ?) but have tildes at the end:\n" . var_export($aTranslatedKeysWithTildes, true));
+ }
+
+ /**
+ * @param string $sFullPath
+ * @param int $iLineNumber
+ *
+ * @return string a path that is clickable in PHPStorm 🤩
+ * For this to happen we need full path with correct dir sep + line number
+ * If it is not, check in File | Settings | Tools | Terminal the hyperlink option is checked
+ */
+ private function MakeFilePathClickable(string $sFullPath, int $iLineNumber):string {
+ return str_replace(array('//', '/'), array('/', DIRECTORY_SEPARATOR), $sFullPath).':'.$iLineNumber;
+ }
+
+ private function FindDictKeyLineNumberInContent(string $sFileContent, string $sDictKey): int
+ {
+ $aContentLines = explode("\n", $sFileContent);
+ $sDictKeyToFind = "'{$sDictKey}'"; // adding string delimiters to match exact dict key (eg if not we would match 'Core:AttributeDateTime?SmartSearch' for 'Core:AttributeDateTime')
+
+ foreach($aContentLines as $iLineNumber => $line) {
+ if(strpos($line, $sDictKeyToFind) !== false){
+ return $iLineNumber;
+ }
+ }
+
+ return 1;
+ }
+
}