diff --git a/core/metamodel.class.php b/core/metamodel.class.php
index fb09fab78a..91216eb4e8 100644
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -3496,7 +3496,7 @@ abstract class MetaModel
 		}
 		if (array_key_exists($sAttCode, self::$m_aAttribDefs[$sTargetClass]))
 		{
-			throw new Exception("Declaration of $sTargetClass: attempting to redeclare the inherited attribute '$sAttCode', originaly declared in ".self::$m_aAttribOrigins[$sTargetClass][$sAttCode]);
+			throw new Exception("Declaration of $sTargetClass: attempting to redeclare the inherited attribute '$sAttCode', originally declared in ".self::$m_aAttribOrigins[$sTargetClass][$sAttCode]);
 		}
 
 		// Set the "host class" as soon as possible, since HierarchicalKeys use it for their 'target class' as well
@@ -4934,7 +4934,7 @@ abstract class MetaModel
 				//
 				foreach(self::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
 				{
-					// Skip this attribute if not originaly defined in this class
+					// Skip this attribute if not originally defined in this class
 					if (self::$m_aAttribOrigins[$sClass][$sAttCode] != $sClass)
 					{
 						continue;
@@ -5308,7 +5308,7 @@ abstract class MetaModel
 				$sClassRes .= self::MakeDictEntry("Class:$sClass+", self::GetClassDescription_Obsolete($sClass), '', $bNotInDico);
 				foreach(self::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
 				{
-					// Skip this attribute if not originaly defined in this class
+					// Skip this attribute if not originally defined in this class
 					if (self::$m_aAttribOrigins[$sClass][$sAttCode] != $sClass)
 					{
 						continue;
@@ -5472,7 +5472,7 @@ abstract class MetaModel
 			{
 				if (!$oAttDef->CopyOnAllTables())
 				{
-					// Skip this attribute if not originaly defined in this class
+					// Skip this attribute if not originally defined in this class
 					if (self::$m_aAttribOrigins[$sClass][$sAttCode] != $sClass)
 					{
 						continue;
diff --git a/datamodels/2.x/combodo-db-tools/cs.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/cs.dict.combodo-db-tools.php
index 94f983e9dc..46219432ac 100644
--- a/datamodels/2.x/combodo-db-tools/cs.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/cs.dict.combodo-db-tools.php
@@ -51,7 +51,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
 	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
 	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
-	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value than `%3$s`.`%1$s`~~',
+	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value as `%3$s`.`%1$s`~~',
 	'DBAnalyzer-Integrity-RootFinalClass' => 'Field `%2$s`.`%1$s` must contains a valid class~~',
 ));
 
diff --git a/datamodels/2.x/combodo-db-tools/da.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/da.dict.combodo-db-tools.php
index f0bb76ddf8..290e1c4423 100644
--- a/datamodels/2.x/combodo-db-tools/da.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/da.dict.combodo-db-tools.php
@@ -51,7 +51,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
 	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
 	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
-	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value than `%3$s`.`%1$s`~~',
+	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value as `%3$s`.`%1$s`~~',
 	'DBAnalyzer-Integrity-RootFinalClass' => 'Field `%2$s`.`%1$s` must contains a valid class~~',
 ));
 
diff --git a/datamodels/2.x/combodo-db-tools/de.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/de.dict.combodo-db-tools.php
index 076eacc3e8..e1f466b74b 100644
--- a/datamodels/2.x/combodo-db-tools/de.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/de.dict.combodo-db-tools.php
@@ -48,7 +48,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'DBAnalyzer-Integrity-InvalidValue' => 'Ungültiger Wert für %1$s (Spalte: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Manche Benutzerkonten haben keinerlei zugewiesenes Profi',
 	'DBAnalyzer-Fetch-Count-Error' => 'Fetch-Count-Fehler in `%1$s`, %2$d Einträge geholt (fetched) / %3$d gezählt',
-	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value than `%3$s`.`%1$s`~~',
+	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value as `%3$s`.`%1$s`~~',
 	'DBAnalyzer-Integrity-RootFinalClass' => 'Field `%2$s`.`%1$s` must contains a valid class~~',
 ));
 
diff --git a/datamodels/2.x/combodo-db-tools/en.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/en.dict.combodo-db-tools.php
index faeb87d33b..4ea35ab197 100644
--- a/datamodels/2.x/combodo-db-tools/en.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/en.dict.combodo-db-tools.php
@@ -52,7 +52,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all',
 	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted',
-	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value than `%3$s`.`%1$s`',
+	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value as `%3$s`.`%1$s`',
 	'DBAnalyzer-Integrity-RootFinalClass' => 'Field `%2$s`.`%1$s` must contains a valid class',
 ));
 
diff --git a/datamodels/2.x/combodo-db-tools/es_cr.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/es_cr.dict.combodo-db-tools.php
index 5ce4a7967a..50c5977de1 100644
--- a/datamodels/2.x/combodo-db-tools/es_cr.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/es_cr.dict.combodo-db-tools.php
@@ -51,7 +51,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'DBAnalyzer-Integrity-InvalidValue' => 'Valor inválido para %1$s (columna: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Algunas cuentas de usuario no tienen perfil asignado',
 	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
-	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value than `%3$s`.`%1$s`~~',
+	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value as `%3$s`.`%1$s`~~',
 	'DBAnalyzer-Integrity-RootFinalClass' => 'Field `%2$s`.`%1$s` must contains a valid class~~',
 ));
 
diff --git a/datamodels/2.x/combodo-db-tools/hu.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/hu.dict.combodo-db-tools.php
index 9da87724f3..a056654a9b 100644
--- a/datamodels/2.x/combodo-db-tools/hu.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/hu.dict.combodo-db-tools.php
@@ -51,7 +51,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
 	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
 	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
-	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value than `%3$s`.`%1$s`~~',
+	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value as `%3$s`.`%1$s`~~',
 	'DBAnalyzer-Integrity-RootFinalClass' => 'Field `%2$s`.`%1$s` must contains a valid class~~',
 ));
 
diff --git a/datamodels/2.x/combodo-db-tools/it.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/it.dict.combodo-db-tools.php
index fb8795baa7..2b2fa4bef3 100644
--- a/datamodels/2.x/combodo-db-tools/it.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/it.dict.combodo-db-tools.php
@@ -51,7 +51,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
 	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
 	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
-	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value than `%3$s`.`%1$s`~~',
+	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value as `%3$s`.`%1$s`~~',
 	'DBAnalyzer-Integrity-RootFinalClass' => 'Field `%2$s`.`%1$s` must contains a valid class~~',
 ));
 
diff --git a/datamodels/2.x/combodo-db-tools/ja.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/ja.dict.combodo-db-tools.php
index eb09d218dd..31ac177c97 100644
--- a/datamodels/2.x/combodo-db-tools/ja.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/ja.dict.combodo-db-tools.php
@@ -51,7 +51,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
 	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
 	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
-	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value than `%3$s`.`%1$s`~~',
+	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value as `%3$s`.`%1$s`~~',
 	'DBAnalyzer-Integrity-RootFinalClass' => 'Field `%2$s`.`%1$s` must contains a valid class~~',
 ));
 
diff --git a/datamodels/2.x/combodo-db-tools/nl.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/nl.dict.combodo-db-tools.php
index edbee09e57..d2b8e36045 100644
--- a/datamodels/2.x/combodo-db-tools/nl.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/nl.dict.combodo-db-tools.php
@@ -53,7 +53,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'DBAnalyzer-Integrity-InvalidValue' => 'Ongeldige waarde voor %1$s (kolom: "%2$s.%3$s")',
 	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Sommige gebruikersaccounts hebben geen profiel',
 	'DBAnalyzer-Fetch-Count-Error' => 'Opvraag-fout in "%1$s", %2$d records opgevraagd / %3$d geteld',
-	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value than `%3$s`.`%1$s`~~',
+	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value as `%3$s`.`%1$s`~~',
 	'DBAnalyzer-Integrity-RootFinalClass' => 'Field `%2$s`.`%1$s` must contains a valid class~~',
 ));
 
diff --git a/datamodels/2.x/combodo-db-tools/pt_br.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/pt_br.dict.combodo-db-tools.php
index 83c073deb7..34037ea727 100644
--- a/datamodels/2.x/combodo-db-tools/pt_br.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/pt_br.dict.combodo-db-tools.php
@@ -51,7 +51,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
 	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
 	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
-	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value than `%3$s`.`%1$s`~~',
+	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value as `%3$s`.`%1$s`~~',
 	'DBAnalyzer-Integrity-RootFinalClass' => 'Field `%2$s`.`%1$s` must contains a valid class~~',
 ));
 
diff --git a/datamodels/2.x/combodo-db-tools/ru.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/ru.dict.combodo-db-tools.php
index 4dd69cb5f8..fc92a62cf5 100644
--- a/datamodels/2.x/combodo-db-tools/ru.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/ru.dict.combodo-db-tools.php
@@ -38,7 +38,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'DBAnalyzer-Integrity-InvalidValue' => 'Недопустимое значение для %1$s (столбец: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Некоторые учетные записи пользователей не имеют профилей',
 	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
-	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value than `%3$s`.`%1$s`~~',
+	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value as `%3$s`.`%1$s`~~',
 	'DBAnalyzer-Integrity-RootFinalClass' => 'Field `%2$s`.`%1$s` must contains a valid class~~',
 ));
 
diff --git a/datamodels/2.x/combodo-db-tools/sk.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/sk.dict.combodo-db-tools.php
index 255f65fe3d..52f3b6fae1 100644
--- a/datamodels/2.x/combodo-db-tools/sk.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/sk.dict.combodo-db-tools.php
@@ -51,7 +51,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
 	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
 	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
-	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value than `%3$s`.`%1$s`~~',
+	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value as `%3$s`.`%1$s`~~',
 	'DBAnalyzer-Integrity-RootFinalClass' => 'Field `%2$s`.`%1$s` must contains a valid class~~',
 ));
 
diff --git a/datamodels/2.x/combodo-db-tools/tr.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/tr.dict.combodo-db-tools.php
index 66a6a3d179..0f202a577e 100644
--- a/datamodels/2.x/combodo-db-tools/tr.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/tr.dict.combodo-db-tools.php
@@ -51,7 +51,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
 	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
 	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
-	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value than `%3$s`.`%1$s`~~',
+	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value as `%3$s`.`%1$s`~~',
 	'DBAnalyzer-Integrity-RootFinalClass' => 'Field `%2$s`.`%1$s` must contains a valid class~~',
 ));