From 5b496f4d15fc1ca09a198b767bf64a2bcbc8fbe0 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Thu, 26 Mar 2020 10:49:28 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B02866=20Change=20"cron"=20case=20in=20lab?=
 =?UTF-8?q?els=20as=20it=20is=20not=20an=20acronym=20Thanks=20@Hipska=20fo?=
 =?UTF-8?q?r=20the=20feedback=20done=20in=20Combodo/iTop#124=20!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 datamodels/2.x/itop-backup/check-backup.php | 2 +-
 dictionaries/cs.dictionary.itop.core.php    | 2 +-
 dictionaries/da.dictionary.itop.core.php    | 2 +-
 dictionaries/de.dictionary.itop.core.php    | 2 +-
 dictionaries/en.dictionary.itop.core.php    | 2 +-
 dictionaries/es_cr.dictionary.itop.core.php | 2 +-
 dictionaries/fr.dictionary.itop.core.php    | 4 ++--
 dictionaries/hu.dictionary.itop.core.php    | 2 +-
 dictionaries/it.dictionary.itop.core.php    | 2 +-
 dictionaries/ja.dictionary.itop.core.php    | 2 +-
 dictionaries/nl.dictionary.itop.core.php    | 2 +-
 dictionaries/pt_br.dictionary.itop.core.php | 2 +-
 dictionaries/ru.dictionary.itop.core.php    | 2 +-
 dictionaries/sk.dictionary.itop.core.php    | 2 +-
 dictionaries/tr.dictionary.itop.core.php    | 2 +-
 dictionaries/zh_cn.dictionary.itop.core.php | 2 +-
 documentation/itop-tickets.htm              | 2 +-
 setup/wizardsteps.class.inc.php             | 2 +-
 webservices/cron.distrib                    | 2 +-
 webservices/cron.php                        | 4 ++--
 20 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/datamodels/2.x/itop-backup/check-backup.php b/datamodels/2.x/itop-backup/check-backup.php
index a898e0bb2..4f8a5cfed 100644
--- a/datamodels/2.x/itop-backup/check-backup.php
+++ b/datamodels/2.x/itop-backup/check-backup.php
@@ -23,7 +23,7 @@
 // Developer's notes:
 //   Duplicated code: sys_get_temp_dir, the computation of the target filename, etc.
 
-// Recommended usage in CRON
+// Recommended usage in cron
 // /usr/bin/php -q /var/www/combodo/modules/itop-backup/check-backup.php --backup_file=/home/backups/combodo-crm-%Y-%m-%d
 // Do not forget to set the 'itop_backup_incident' configuration file parameter !
 
diff --git a/dictionaries/cs.dictionary.itop.core.php b/dictionaries/cs.dictionary.itop.core.php
index 31e4f409f..a6cbc5787 100755
--- a/dictionaries/cs.dictionary.itop.core.php
+++ b/dictionaries/cs.dictionary.itop.core.php
@@ -210,7 +210,7 @@ Operátory:<br/>
 	'Core:Context=Synchro' => 'Synchro~~',
 	'Core:Context=Setup' => 'Setup~~',
 	'Core:Context=GUI:Console' => 'Console~~',
-	'Core:Context=CRON' => 'CRON~~',
+	'Core:Context=CRON' => 'cron~~',
 	'Core:Context=GUI:Portal' => 'Portal~~',
 ));
 
diff --git a/dictionaries/da.dictionary.itop.core.php b/dictionaries/da.dictionary.itop.core.php
index 810899b38..619451c68 100644
--- a/dictionaries/da.dictionary.itop.core.php
+++ b/dictionaries/da.dictionary.itop.core.php
@@ -208,7 +208,7 @@ Operators:<br/>
 	'Core:Context=Synchro' => 'Synchro~~',
 	'Core:Context=Setup' => 'Setup~~',
 	'Core:Context=GUI:Console' => 'Console~~',
-	'Core:Context=CRON' => 'CRON~~',
+	'Core:Context=CRON' => 'cron~~',
 	'Core:Context=GUI:Portal' => 'Portal~~',
 ));
 
diff --git a/dictionaries/de.dictionary.itop.core.php b/dictionaries/de.dictionary.itop.core.php
index d00508f10..720df9d69 100644
--- a/dictionaries/de.dictionary.itop.core.php
+++ b/dictionaries/de.dictionary.itop.core.php
@@ -207,7 +207,7 @@ Operatoren:<br/>
 	'Core:Context=Synchro' => 'Synchro',
 	'Core:Context=Setup' => 'Setup',
 	'Core:Context=GUI:Console' => 'Konsole',
-	'Core:Context=CRON' => 'CRON',
+	'Core:Context=CRON' => 'cron',
 	'Core:Context=GUI:Portal' => 'Portal',
 ));
 
diff --git a/dictionaries/en.dictionary.itop.core.php b/dictionaries/en.dictionary.itop.core.php
index b5d0ed61f..38214190e 100644
--- a/dictionaries/en.dictionary.itop.core.php
+++ b/dictionaries/en.dictionary.itop.core.php
@@ -208,7 +208,7 @@ Operators:<br/>
 	'Core:Context=Synchro' => 'Synchro',
 	'Core:Context=Setup' => 'Setup',
 	'Core:Context=GUI:Console' => 'Console',
-	'Core:Context=CRON' => 'CRON',
+	'Core:Context=CRON' => 'cron',
 	'Core:Context=GUI:Portal' => 'Portal',
 ));
 
diff --git a/dictionaries/es_cr.dictionary.itop.core.php b/dictionaries/es_cr.dictionary.itop.core.php
index 78f40a8be..c0d645a24 100644
--- a/dictionaries/es_cr.dictionary.itop.core.php
+++ b/dictionaries/es_cr.dictionary.itop.core.php
@@ -208,7 +208,7 @@ Operadores:<br/>
 	'Core:Context=Synchro' => 'Synchro~~',
 	'Core:Context=Setup' => 'Setup~~',
 	'Core:Context=GUI:Console' => 'Console~~',
-	'Core:Context=CRON' => 'CRON~~',
+	'Core:Context=CRON' => 'cron~~',
 	'Core:Context=GUI:Portal' => 'Portal~~',
 ));
 
diff --git a/dictionaries/fr.dictionary.itop.core.php b/dictionaries/fr.dictionary.itop.core.php
index aa333b89a..e4d60f306 100644
--- a/dictionaries/fr.dictionary.itop.core.php
+++ b/dictionaries/fr.dictionary.itop.core.php
@@ -206,7 +206,7 @@ Opérateurs :<br/>
 	'Core:Context=Synchro' => 'Synchro',
 	'Core:Context=Setup' => 'Setup',
 	'Core:Context=GUI:Console' => 'Console',
-	'Core:Context=CRON' => 'CRON',
+	'Core:Context=CRON' => 'cron',
 	'Core:Context=GUI:Portal' => 'Portal',
 ));
 
@@ -1051,6 +1051,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
  'Core:Context=Synchro+' => 'Synchro',
  'Core:Context=Setup+' => 'Setup',
  'Core:Context=GUI:Console+' => 'GUI:Console',
- 'Core:Context=CRON+' => 'CRON',
+ 'Core:Context=CRON+' => 'cron',
  'Core:Context=GUI:Portal+' => 'GUI:Portal',
 ));
diff --git a/dictionaries/hu.dictionary.itop.core.php b/dictionaries/hu.dictionary.itop.core.php
index b8989c3f2..bc42eae22 100755
--- a/dictionaries/hu.dictionary.itop.core.php
+++ b/dictionaries/hu.dictionary.itop.core.php
@@ -206,7 +206,7 @@ Operators:<br/>
 	'Core:Context=Synchro' => 'Synchro~~',
 	'Core:Context=Setup' => 'Setup~~',
 	'Core:Context=GUI:Console' => 'Console~~',
-	'Core:Context=CRON' => 'CRON~~',
+	'Core:Context=CRON' => 'cron~~',
 	'Core:Context=GUI:Portal' => 'Portal~~',
 ));
 
diff --git a/dictionaries/it.dictionary.itop.core.php b/dictionaries/it.dictionary.itop.core.php
index 39f153d76..ea4d21ed0 100644
--- a/dictionaries/it.dictionary.itop.core.php
+++ b/dictionaries/it.dictionary.itop.core.php
@@ -208,7 +208,7 @@ Operatori:<br/>
 	'Core:Context=Synchro' => 'Synchro~~',
 	'Core:Context=Setup' => 'Setup~~',
 	'Core:Context=GUI:Console' => 'Console~~',
-	'Core:Context=CRON' => 'CRON~~',
+	'Core:Context=CRON' => 'cron~~',
 	'Core:Context=GUI:Portal' => 'Portal~~',
 ));
 
diff --git a/dictionaries/ja.dictionary.itop.core.php b/dictionaries/ja.dictionary.itop.core.php
index 4968b77ec..ee45b3014 100644
--- a/dictionaries/ja.dictionary.itop.core.php
+++ b/dictionaries/ja.dictionary.itop.core.php
@@ -206,7 +206,7 @@ Operators:<br/>
 	'Core:Context=Synchro' => 'Synchro~~',
 	'Core:Context=Setup' => 'Setup~~',
 	'Core:Context=GUI:Console' => 'Console~~',
-	'Core:Context=CRON' => 'CRON~~',
+	'Core:Context=CRON' => 'cron~~',
 	'Core:Context=GUI:Portal' => 'Portal~~',
 ));
 
diff --git a/dictionaries/nl.dictionary.itop.core.php b/dictionaries/nl.dictionary.itop.core.php
index a59d37cc8..b1bacd34d 100644
--- a/dictionaries/nl.dictionary.itop.core.php
+++ b/dictionaries/nl.dictionary.itop.core.php
@@ -214,7 +214,7 @@ Operators:<br/>
 	'Core:Context=Synchro' => 'Synchro',
 	'Core:Context=Setup' => 'Setup',
 	'Core:Context=GUI:Console' => 'Console',
-	'Core:Context=CRON' => 'CRON',
+	'Core:Context=CRON' => 'cron',
 	'Core:Context=GUI:Portal' => 'Portaal',
 ));
 
diff --git a/dictionaries/pt_br.dictionary.itop.core.php b/dictionaries/pt_br.dictionary.itop.core.php
index e9c56a41d..887873b3e 100644
--- a/dictionaries/pt_br.dictionary.itop.core.php
+++ b/dictionaries/pt_br.dictionary.itop.core.php
@@ -208,7 +208,7 @@ Operadores:<br/>
 	'Core:Context=Synchro' => 'Synchro~~',
 	'Core:Context=Setup' => 'Setup~~',
 	'Core:Context=GUI:Console' => 'Console~~',
-	'Core:Context=CRON' => 'CRON~~',
+	'Core:Context=CRON' => 'cron~~',
 	'Core:Context=GUI:Portal' => 'Portal~~',
 ));
 
diff --git a/dictionaries/ru.dictionary.itop.core.php b/dictionaries/ru.dictionary.itop.core.php
index 4841218ba..948161571 100644
--- a/dictionaries/ru.dictionary.itop.core.php
+++ b/dictionaries/ru.dictionary.itop.core.php
@@ -195,7 +195,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Core:Context=Synchro' => 'Synchro~~',
 	'Core:Context=Setup' => 'Setup~~',
 	'Core:Context=GUI:Console' => 'Console~~',
-	'Core:Context=CRON' => 'CRON~~',
+	'Core:Context=CRON' => 'cron~~',
 	'Core:Context=GUI:Portal' => 'Portal~~',
 ));
 
diff --git a/dictionaries/sk.dictionary.itop.core.php b/dictionaries/sk.dictionary.itop.core.php
index a08711dda..b59571617 100644
--- a/dictionaries/sk.dictionary.itop.core.php
+++ b/dictionaries/sk.dictionary.itop.core.php
@@ -205,7 +205,7 @@ Operatori:<br/>
 	'Core:Context=Synchro' => 'Synchro~~',
 	'Core:Context=Setup' => 'Setup~~',
 	'Core:Context=GUI:Console' => 'Console~~',
-	'Core:Context=CRON' => 'CRON~~',
+	'Core:Context=CRON' => 'cron~~',
 	'Core:Context=GUI:Portal' => 'Portal~~',
 ));
 
diff --git a/dictionaries/tr.dictionary.itop.core.php b/dictionaries/tr.dictionary.itop.core.php
index 0b10b4993..8ec3141fb 100644
--- a/dictionaries/tr.dictionary.itop.core.php
+++ b/dictionaries/tr.dictionary.itop.core.php
@@ -216,7 +216,7 @@ Operators:<br/>
 	'Core:Context=Synchro' => 'Synchro~~',
 	'Core:Context=Setup' => 'Setup~~',
 	'Core:Context=GUI:Console' => 'Console~~',
-	'Core:Context=CRON' => 'CRON~~',
+	'Core:Context=CRON' => 'cron~~',
 	'Core:Context=GUI:Portal' => 'Portal~~',
 ));
 
diff --git a/dictionaries/zh_cn.dictionary.itop.core.php b/dictionaries/zh_cn.dictionary.itop.core.php
index 19855951b..7807f117d 100644
--- a/dictionaries/zh_cn.dictionary.itop.core.php
+++ b/dictionaries/zh_cn.dictionary.itop.core.php
@@ -207,7 +207,7 @@ Operators:<br/>
 	'Core:Context=Synchro' => 'Synchro~~',
 	'Core:Context=Setup' => 'Setup~~',
 	'Core:Context=GUI:Console' => 'Console~~',
-	'Core:Context=CRON' => 'CRON~~',
+	'Core:Context=CRON' => 'cron~~',
 	'Core:Context=GUI:Portal' => 'Portal~~',
 ));
 
diff --git a/documentation/itop-tickets.htm b/documentation/itop-tickets.htm
index 9bfd506be..497b3d77b 100644
--- a/documentation/itop-tickets.htm
+++ b/documentation/itop-tickets.htm
@@ -91,7 +91,7 @@ In order to ease the installation, all the background tasks have been grouped to
 <li>Edit the file <b>cron.params</b> to set the credentials used for cronified tasks</li>
 <li>Edit the file <em>&lt;itop root&gt</em>/webservices/<b>cron.cmd</b>, and set the relevant path for your installation of PHP.</li>
 <li>Schedule the execution of cron.cmd:
-  <pre>schtasks.exe /create /tn "iTop CRON" /sc minute /mo 1 /tr "\"<em>&lt;itop root&gt</em>/webservices/cron.cmd\""</pre>
+  <pre>schtasks.exe /create /tn "iTop Cron" /sc minute /mo 1 /tr "\"<em>&lt;itop root&gt</em>/webservices/cron.cmd\""</pre>
 </li> 
 </ol>
 
diff --git a/setup/wizardsteps.class.inc.php b/setup/wizardsteps.class.inc.php
index c61d4745f..0db8640e8 100644
--- a/setup/wizardsteps.class.inc.php
+++ b/setup/wizardsteps.class.inc.php
@@ -658,7 +658,7 @@ EOF
 			if ($oMutex->IsLocked())
 			{
 				$oPage->add(<<<HTML
-<div class="message">An iTop CRON process is being executed on the target database. iTop CRON process will be stopped during the setup execution.</div>
+<div class="message">An iTop cron process is being executed on the target database. iTop cron process will be stopped during the setup execution.</div>
 HTML
 				);
 			}
diff --git a/webservices/cron.distrib b/webservices/cron.distrib
index 2e3240149..59fa6b8c9 100644
--- a/webservices/cron.distrib
+++ b/webservices/cron.distrib
@@ -1,4 +1,4 @@
-# CRON parameters file used by cron.cmd
+# cron parameters file used by cron.cmd
 #
 # Warning: make sure that this file is NOT readable by the web server
 
diff --git a/webservices/cron.php b/webservices/cron.php
index 59e19c251..145c758fe 100644
--- a/webservices/cron.php
+++ b/webservices/cron.php
@@ -479,11 +479,11 @@ set_time_limit(0); // Some background actions may really take long to finish (li
 
 if (utils::IsModeCLI())
 {
-	$oP = new CLIPage("iTop - CRON");
+	$oP = new CLIPage("iTop - cron");
 }
 else
 {
-	$oP = new WebPage("iTop - CRON");
+	$oP = new WebPage("iTop - cron");
 }
 
 try