From 99a39cc80ea3eb6f58a87ab31452885f5cb60735 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Fri, 24 Nov 2017 17:53:38 +0100 Subject: Fixed a spelling mistake in several comments: It's called "override" instead of "overwrite" in those contexts. --- core/application.php | 4 ++-- core/configuration-example.php | 4 ++-- template/admin/lang/de.php | 2 +- template/admin/lang/en.php | 2 +- template/standard/lang/de.php | 2 +- template/standard/lang/en.php | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/application.php b/core/application.php index 4c7fdb2..ee34d54 100644 --- a/core/application.php +++ b/core/application.php @@ -94,7 +94,7 @@ foreach($configuration as $name => $value) { require 'configuration.php'; #=============================================================================== -# Overwrite configuration if admin +# Override configuration if admin #=============================================================================== if(defined('ADMINISTRATION') AND ADMINISTRATION === TRUE) { @@ -111,7 +111,7 @@ if(defined('ADMINISTRATION') AND ADMINISTRATION === TRUE) { } #=========================================================================== - # Overwrite configuration + # Override configuration #=========================================================================== Application::set('CORE.LANGUAGE', Application::get('ADMIN.LANGUAGE')); Application::set('TEMPLATE.NAME', Application::get('ADMIN.TEMPLATE')); diff --git a/core/configuration-example.php b/core/configuration-example.php index 7805320..6c7d40a 100644 --- a/core/configuration-example.php +++ b/core/configuration-example.php @@ -3,9 +3,9 @@ # Main configuration [Thomas Lange ] # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# # # -# This file overwrites the pre-defined configuration values of the application # +# This file will override the pre-defined configuration settings of the system # # and is the primary file where you change the configuration. Do not touch any # -# other files to change your configuration – just overwrite it here! # +# other files to change your configuration – just override it here! # # # # Documentation: # # 1. https://github.com/Nerdmind/Blog/wiki/Configuration # diff --git a/template/admin/lang/de.php b/template/admin/lang/de.php index 7591a8f..288a5f7 100644 --- a/template/admin/lang/de.php +++ b/template/admin/lang/de.php @@ -4,7 +4,7 @@ #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# # # # This file contains template internationalization strings for the DE language # -# and can also overwrite the existing core internationalization strings. # +# and can also override the existing core internationalization strings. # # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# diff --git a/template/admin/lang/en.php b/template/admin/lang/en.php index 63a18f5..d774a36 100644 --- a/template/admin/lang/en.php +++ b/template/admin/lang/en.php @@ -4,7 +4,7 @@ #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# # # # This file contains template internationalization strings for the EN language # -# and can also overwrite the existing core internationalization strings. # +# and can also override the existing core internationalization strings. # # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# diff --git a/template/standard/lang/de.php b/template/standard/lang/de.php index 2c5008e..6a18831 100644 --- a/template/standard/lang/de.php +++ b/template/standard/lang/de.php @@ -4,7 +4,7 @@ #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# # # # This file contains template internationalization strings for the DE language # -# and can also overwrite the existing core internationalization strings. # +# and can also override the existing core internationalization strings. # # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# diff --git a/template/standard/lang/en.php b/template/standard/lang/en.php index 3d42fe0..17d638f 100644 --- a/template/standard/lang/en.php +++ b/template/standard/lang/en.php @@ -4,7 +4,7 @@ #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# # # # This file contains template internationalization strings for the EN language # -# and can also overwrite the existing core internationalization strings. # +# and can also override the existing core internationalization strings. # # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# -- cgit v1.2.3