Skip to content

Commit 0e90846

Browse files
AgelxNashAgelxNash
committed
feat(lexicon): merge with 1.4.x
1 parent 0a2c3ed commit 0e90846

41 files changed

Lines changed: 1730 additions & 1739 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎install/src/lang/english.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
$_lang["please_correct_errors"] = '. Please correct the errors';
135135
$_lang["plugins"] = 'Plugins';
136136
$_lang["preinstall_validation"] = 'Pre-install validation';
137-
$_lang["recommend_collation"] = 'utf8mb4_general_ci';
137+
$_lang["recommend_collation"] = 'utf8_general_ci';
138138
$_lang["recommend_collations_order"] = 'utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci';
139139
$_lang["recommend_setting_change_title"] = 'Recommended Setting Change';
140140
$_lang["recommend_setting_change_validate_referer_confirmation"] = 'Setting change: <em>Validate HTTP_REFERER headers?</em>';
@@ -203,4 +203,4 @@
203203
$_lang["writing_config_file"] = 'Writing configuration file: ';
204204
$_lang["yes"] = 'Yes';
205205
$_lang["you_running_php"] = ' - You are running on PHP ';
206-
?>
206+
?>

‎install/src/lang/german.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
$_lang["please_correct_errors"] = '. Bitte beheben Sie die Fehler';
134134
$_lang["plugins"] = 'Plugins';
135135
$_lang["preinstall_validation"] = 'Prüfung vor der Installation';
136-
$_lang["recommend_collation"] = 'utf8mb4_general_ci';
136+
$_lang["recommend_collation"] = 'utf8_general_ci';
137137
$_lang["recommend_collations_order"] = 'utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci';
138138
$_lang["recommend_setting_change_title"] = 'Empfohlene Änderung der Konfiguration';
139139
$_lang["recommend_setting_change_validate_referer_confirmation"] = 'Einstellung aktivieren: <em>HTTP_REFERER-Header überprüfen?</em>';
@@ -202,4 +202,4 @@
202202
$_lang["writing_config_file"] = 'Schreibe Konfigurationsdatei: ';
203203
$_lang["yes"] = 'Ja';
204204
$_lang["you_running_php"] = ' – Benutzte PHP-Version ';
205-
?>
205+
?>

‎install/src/lang/italian.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
$_lang["please_correct_errors"] = '. Vi preghiamo di correggere gli errori';
135135
$_lang["plugins"] = 'Plugins';
136136
$_lang["preinstall_validation"] = 'Verifica Pre-Installazione';
137-
$_lang["recommend_collation"] = 'utf8mb4_general_ci';
137+
$_lang["recommend_collation"] = 'utf8_general_ci';
138138
$_lang["recommend_collations_order"] = 'utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci';
139139
$_lang["recommend_setting_change_title"] = 'Modifiche consigliate alla Configurazione';
140140
$_lang["recommend_setting_change_validate_referer_confirmation"] = 'Modifica: <em>Validazione degli headers HTTP_REFERER?</em>';
@@ -203,4 +203,4 @@
203203
$_lang["writing_config_file"] = 'Scrittura del file di configurazione: ';
204204
$_lang["yes"] = 'Si';
205205
$_lang["you_running_php"] = ' - State eseguendo PHP ';
206-
?>
206+
?>

‎install/src/lang/nederlands-utf8.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
$_lang["please_correct_errors"] = '. Corrigeer de fouten';
135135
$_lang["plugins"] = 'Plug-ins';
136136
$_lang["preinstall_validation"] = 'Valideren van de installatie';
137-
$_lang["recommend_collation"] = 'utf8mb4_general_ci';
137+
$_lang["recommend_collation"] = 'utf8_general_ci';
138138
$_lang["recommend_collations_order"] = 'utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci';
139139
$_lang["recommend_setting_change_title"] = 'Aanbevolen instelling wijziging';
140140
$_lang["recommend_setting_change_validate_referer_confirmation"] = 'Instelling veranderen: <em>Validatie HTTP_REFERER headers?</em>';
@@ -203,4 +203,4 @@
203203
$_lang["writing_config_file"] = 'Configuratiebestand aanmaken:';
204204
$_lang["yes"] = 'Ja';
205205
$_lang["you_running_php"] = '- U werkt met PHP';
206-
?>
206+
?>

‎install/src/lang/polish-utf8.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
$_lang["please_correct_errors"] = '. Proszę popraw błędy';
135135
$_lang["plugins"] = 'Pluginy';
136136
$_lang["preinstall_validation"] = 'Weryfikacja pre-instalacyjna';
137-
$_lang["recommend_collation"] = 'utf8mb4_general_ci';
137+
$_lang["recommend_collation"] = 'utf8_general_ci';
138138
$_lang["recommend_collations_order"] = 'utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci';
139139
$_lang["recommend_setting_change_title"] = 'Rekomendowana zmiana ustawień';
140140
$_lang["recommend_setting_change_validate_referer_confirmation"] = 'Zmiana ustawienia: <em>Weryfikuj nagłówki HTTP_REFERER?</em>';
@@ -203,4 +203,4 @@
203203
$_lang["writing_config_file"] = 'Zapisywanie pliku konfiguracyjnego: ';
204204
$_lang["yes"] = 'Tak';
205205
$_lang["you_running_php"] = '- włączone PHP';
206-
?>
206+
?>

‎manager/includes/lang/bulgarian.inc.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,9 +1146,8 @@
11461146
$_lang["a17_error_reporting_msg"] = 'Set the detection level of the PHP error.';
11471147
$_lang["a17_error_reporting_opt0"] = 'Ignore all';
11481148
$_lang["a17_error_reporting_opt1"] = 'Ignore the warning of a slight notice level(<a href="https://www.google.com/search?q=E_DEPRECATED+E_STRICT" target="_blank">E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT</a>)';
1149-
$_lang["a17_error_reporting_opt2"] = 'Detect all errors except E_NOTICE and E_USER_DEPRECATED';
1150-
$_lang["a17_error_reporting_opt99"] = 'Detect all except E_USER_DEPRECATED';
1151-
$_lang["a17_error_reporting_opt199"] = 'Detect all';
1149+
$_lang["a17_error_reporting_opt2"] = 'Detect all errors except E_NOTICE';
1150+
$_lang["a17_error_reporting_opt99"] = 'Detect all';
11521151

11531152
$_lang["pwd_hash_algo_title"] = 'Hash algorithm';
11541153
$_lang["pwd_hash_algo_message"] = 'Password hash algorithm.';

‎manager/includes/lang/chinese.inc.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,9 +1147,8 @@
11471147
$_lang["a17_error_reporting_msg"] = 'Set the detection level of the PHP errors.';
11481148
$_lang["a17_error_reporting_opt0"] = 'Ignore all';
11491149
$_lang["a17_error_reporting_opt1"] = 'Ignore warnings of a slight notice level (<a href="https://www.google.com/search?q=E_DEPRECATED+E_STRICT" target="_blank">E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT</a>)';
1150-
$_lang["a17_error_reporting_opt2"] = 'Detect all errors except E_NOTICE and E_USER_DEPRECATED';
1151-
$_lang["a17_error_reporting_opt99"] = 'Detect all except E_USER_DEPRECATED';
1152-
$_lang["a17_error_reporting_opt199"] = 'Detect all';
1150+
$_lang["a17_error_reporting_opt2"] = 'Detect all errors except E_NOTICE';
1151+
$_lang["a17_error_reporting_opt99"] = 'Detect all';
11531152

11541153
$_lang["pwd_hash_algo_title"] = 'Hash algorithm';
11551154
$_lang["pwd_hash_algo_message"] = 'Password hash algorithm.';

‎manager/includes/lang/country/francais_country.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
2-
$filename = __DIR__ . '/francais-utf8_country.inc.php';
2+
$filename = dirname(__FILE__) . '/francais-utf8_country.inc.php';
33
$contents = file_get_contents($filename);
44
$contents = utf8_decode($contents);
55
eval('?>' . $contents);
6-
?>
6+
?>

‎manager/includes/lang/country/nederlands_country.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
2-
$filename = __DIR__ . '/nederlands-utf8_country.inc.php';
2+
$filename = dirname(__FILE__) . '/nederlands-utf8_country.inc.php';
33
$contents = file_get_contents($filename);
44
$contents = utf8_decode($contents);
55
eval('?>' . $contents);
6-
?>
6+
?>

‎manager/includes/lang/country/portuguese-br_country.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
2-
$filename = __DIR__ . '/portuguese-br-utf8_country.inc.php';
2+
$filename = dirname(__FILE__) . '/portuguese-br-utf8_country.inc.php';
33
$contents = file_get_contents($filename);
44
$contents = utf8_decode($contents);
55
eval('?>' . $contents);
6-
?>
6+
?>

0 commit comments

Comments
 (0)