Merge pull request #4723 from evgenekorolev/master

Language files aligned, spaces removed and more

upload/admin/language/en-gb/catalog/attribute.php

@@ -23,4 +23,4 @@
 $_['error_permission']       = 'Warning: You do not have permission to modify attributes!';
 $_['error_attribute_group']  = 'Attribute Group Required!';
 $_['error_name']             = 'Attribute Name must be between 3 and 64 characters!';
-$_['error_product']          = 'Warning: This attribute cannot be deleted as it is currently assigned to %s products!';
+$_['error_product']          = 'Warning: This attribute cannot be deleted as it is currently assigned to %s products!';

upload/admin/language/en-gb/catalog/category.php

@@ -43,4 +43,4 @@
 $_['error_name']             = 'Category Name must be between 2 and 255 characters!';
 $_['error_meta_title']       = 'Meta Title must be greater than 3 and less than 255 characters!';
 $_['error_keyword']          = 'SEO URL already in use!';
-$_['error_parent']           = 'The parent category you have chosen is a child of the current one!';
+$_['error_parent']           = 'The parent category you have chosen is a child of the current one!';

upload/admin/language/en-gb/catalog/information.php

@@ -11,15 +11,15 @@
 
 // Column
 $_['column_title']           = 'Information Title';
-$_['column_sort_order']	     = 'Sort Order';
+$_['column_sort_order']      = 'Sort Order';
 $_['column_action']          = 'Action';
 
 // Entry
 $_['entry_title']            = 'Information Title';
 $_['entry_description']      = 'Description';
 $_['entry_store']            = 'Stores';
-$_['entry_meta_title'] 	     = 'Meta Tag Title';
-$_['entry_meta_keyword'] 	 = 'Meta Tag Keywords';
+$_['entry_meta_title']       = 'Meta Tag Title';
+$_['entry_meta_keyword']     = 'Meta Tag Keywords';
 $_['entry_meta_description'] = 'Meta Tag Description';
 $_['entry_keyword']          = 'SEO URL';
 $_['entry_bottom']           = 'Bottom';
@@ -42,4 +42,4 @@
 $_['error_checkout']         = 'Warning: This information page cannot be deleted as it is currently assigned as the store checkout terms!';
 $_['error_affiliate']        = 'Warning: This information page cannot be deleted as it is currently assigned as the store affiliate terms!';
 $_['error_return']           = 'Warning: This information page cannot be deleted as it is currently assigned as the store return terms!';
-$_['error_store']            = 'Warning: This information page cannot be deleted as it is currently used by %s stores!';
+$_['error_store']            = 'Warning: This information page cannot be deleted as it is currently used by %s stores!';

upload/admin/language/en-gb/catalog/manufacturer.php

@@ -31,4 +31,4 @@
 $_['error_permission']  = 'Warning: You do not have permission to modify manufacturers!';
 $_['error_name']        = 'Manufacturer Name must be between 2 and 64 characters!';
 $_['error_keyword']     = 'SEO URL already in use!';
-$_['error_product']     = 'Warning: This manufacturer cannot be deleted as it is currently assigned to %s products!';
+$_['error_product']     = 'Warning: This manufacturer cannot be deleted as it is currently assigned to %s products!';

upload/admin/language/en-gb/catalog/product.php

@@ -27,8 +27,8 @@
 // Entry
 $_['entry_name']             = 'Product Name';
 $_['entry_description']      = 'Description';
-$_['entry_meta_title'] 	     = 'Meta Tag Title';
-$_['entry_meta_keyword'] 	 = 'Meta Tag Keywords';
+$_['entry_meta_title']       = 'Meta Tag Title';
+$_['entry_meta_keyword']     = 'Meta Tag Keywords';
 $_['entry_meta_description'] = 'Meta Tag Description';
 $_['entry_keyword']          = 'SEO URL';
 $_['entry_model']            = 'Model';
@@ -76,7 +76,7 @@
 $_['entry_filter']           = 'Filters';
 $_['entry_download']         = 'Downloads';
 $_['entry_related']          = 'Related Products';
-$_['entry_tag']          	 = 'Product Tags';
+$_['entry_tag']              = 'Product Tags';
 $_['entry_reward']           = 'Reward Points';
 $_['entry_layout']           = 'Layout Override';
 $_['entry_recurring']        = 'Recurring Profile';
@@ -105,4 +105,4 @@
 $_['error_name']             = 'Product Name must be greater than 3 and less than 255 characters!';
 $_['error_meta_title']       = 'Meta Title must be greater than 3 and less than 255 characters!';
 $_['error_model']            = 'Product Model must be greater than 1 and less than 64 characters!';
-$_['error_keyword']          = 'SEO URL already in use!';
+$_['error_keyword']          = 'SEO URL already in use!';

upload/admin/language/en-gb/catalog/recurring.php

@@ -1,42 +1,42 @@
 <?php
 // Heading
-$_['heading_title']			= 'Recurring Profiles';
+$_['heading_title']         = 'Recurring Profiles';
 
 // Text
 $_['text_success']          = 'Success: You have modified recurring profiles!';
 $_['text_list']             = 'Recurring Profile List';
 $_['text_add']              = 'Add Recurring Profile';
 $_['text_edit']             = 'Edit Recurring Profile';
-$_['text_day']				= 'Day';
-$_['text_week']				= 'Week';
-$_['text_semi_month']		= 'Semi Month';
-$_['text_month']			= 'Month';
-$_['text_year']				= 'Year';
-$_['text_recurring']	    = '<p><i class="fa fa-info-circle"></i> Recurring amounts are calculated by the frequency and cycles.</p><p>For example if you use a frequency of "week" and a cycle of "2", then the user will be billed every 2 weeks.</p><p>The duration is the number of times the user will make a payment, set this to 0 if you want payments until they are cancelled.</p>';
-$_['text_profile']			= 'Recurring Profile';
-$_['text_trial']			= 'Trial Profile';
+$_['text_day']              = 'Day';
+$_['text_week']             = 'Week';
+$_['text_semi_month']       = 'Semi Month';
+$_['text_month']            = 'Month';
+$_['text_year']             = 'Year';
+$_['text_recurring']        = '<p><i class="fa fa-info-circle"></i> Recurring amounts are calculated by the frequency and cycles.</p><p>For example if you use a frequency of "week" and a cycle of "2", then the user will be billed every 2 weeks.</p><p>The duration is the number of times the user will make a payment, set this to 0 if you want payments until they are cancelled.</p>';
+$_['text_profile']          = 'Recurring Profile';
+$_['text_trial']            = 'Trial Profile';
 
 // Entry
-$_['entry_name']		    = 'Name';
-$_['entry_price']			= 'Price';
-$_['entry_duration']		= 'Duration';
-$_['entry_cycle']			= 'Cycle';
-$_['entry_frequency']		= 'Frequency';
-$_['entry_trial_price']		= 'Trial price';
-$_['entry_trial_duration']	= 'Trial duration';
-$_['entry_trial_status']	= 'Trial status';
-$_['entry_trial_cycle']	    = 'Trial cycle';
+$_['entry_name']            = 'Name';
+$_['entry_price']           = 'Price';
+$_['entry_duration']        = 'Duration';
+$_['entry_cycle']           = 'Cycle';
+$_['entry_frequency']       = 'Frequency';
+$_['entry_trial_price']     = 'Trial price';
+$_['entry_trial_duration']  = 'Trial duration';
+$_['entry_trial_status']    = 'Trial status';
+$_['entry_trial_cycle']     = 'Trial cycle';
 $_['entry_trial_frequency'] = 'Trial frequency';
-$_['entry_status']			= 'Status';
-$_['entry_sort_order']		= 'Sort Order';
+$_['entry_status']          = 'Status';
+$_['entry_sort_order']      = 'Sort Order';
 
 // Column
-$_['column_name']			= 'Name';
-$_['column_sort_order']	    = 'Sort Order';
+$_['column_name']           = 'Name';
+$_['column_sort_order']     = 'Sort Order';
 $_['column_action']         = 'Action';
 
 // Error
 $_['error_warning']         = 'Warning: Please check the form carefully for errors!';
-$_['error_permission']		= 'Warning: You do not have permission to modify recurring profiles!';
-$_['error_name']			= 'Profile Name must be greater than 3 and less than 255 characters!';
-$_['error_product']			= 'Warning: This recurring profile cannot be deleted as it is currently assigned to %s products!';
+$_['error_permission']      = 'Warning: You do not have permission to modify recurring profiles!';
+$_['error_name']            = 'Profile Name must be greater than 3 and less than 255 characters!';
+$_['error_product']         = 'Warning: This recurring profile cannot be deleted as it is currently assigned to %s products!';

upload/admin/language/en-gb/common/column_left.php

@@ -91,13 +91,13 @@
 $_['text_openbay_ebay']              = 'eBay';
 $_['text_openbay_amazon']            = 'Amazon (EU)';
 $_['text_openbay_amazonus']          = 'Amazon (US)';
-$_['text_openbay_etsy']            	 = 'Etsy';
+$_['text_openbay_etsy']              = 'Etsy';
 $_['text_openbay_settings']          = 'Settings';
 $_['text_openbay_links']             = 'Item links';
 $_['text_openbay_report_price']      = 'Pricing report';
 $_['text_openbay_order_import']      = 'Order import';
 $_['text_paypal']                    = 'PayPal';
 $_['text_paypal_search']             = 'Search';
-$_['text_complete_status']           = 'Orders Completed'; 
-$_['text_processing_status']         = 'Orders Processing'; 
-$_['text_other_status']              = 'Other Statuses'; 
+$_['text_complete_status']           = 'Orders Completed';
+$_['text_processing_status']         = 'Orders Processing';
+$_['text_other_status']              = 'Other Statuses';

upload/admin/language/en-gb/common/filemanager.php

@@ -20,4 +20,4 @@
 $_['error_filesize']   = 'Warning: Incorrect file size!';
 $_['error_filetype']   = 'Warning: Incorrect file type!';
 $_['error_upload']     = 'Warning: File could not be uploaded for an unknown reason!';
-$_['error_delete']     = 'Warning: You can not delete this directory!';
+$_['error_delete']     = 'Warning: You can not delete this directory!';

upload/admin/language/en-gb/common/forgotten.php

@@ -1,5 +1,5 @@
 <?php
-// header
+// Heading
 $_['heading_title']   = 'Forgot Your Password?';
 
 // Text

upload/admin/language/en-gb/common/header.php

@@ -20,4 +20,4 @@
 $_['text_homepage']          = 'OpenCart Homepage';
 $_['text_support']           = 'Support Forum';
 $_['text_documentation']     = 'Documentation';
-$_['text_logout']            = 'Logout';
+$_['text_logout']            = 'Logout';

upload/admin/language/en-gb/common/login.php

@@ -1,5 +1,5 @@
 <?php
-// header
+// Heading
 $_['heading_title']  = 'Administration';
 
 // Text

upload/admin/language/en-gb/common/reset.php

@@ -1,5 +1,5 @@
 <?php
-// header
+// Heading
 $_['heading_title']  = 'Reset your password';
 
 // Text

upload/admin/language/en-gb/design/translation.php

@@ -14,10 +14,10 @@
 $_['column_progress']  = 'Translation Progress';
 $_['column_action']    = 'Action';
 
-// button
+// Button
 $_['button_install']   = 'Install';
 $_['button_uninstall'] = 'Uninstall';
 $_['button_refresh']   = 'Refresh';
 
 // Error
-$_['error_permission'] = 'Warning: You do not have permission to modify language translation!';
+$_['error_permission'] = 'Warning: You do not have permission to modify language translation!';

upload/admin/language/en-gb/en-gb.php

@@ -149,4 +149,4 @@
 $_['error_upload_7']                = 'Warning: Failed to write file to disk!';
 $_['error_upload_8']                = 'Warning: File upload stopped by extension!';
 $_['error_upload_999']              = 'Warning: No error code available!';
-$_['error_curl']                    = 'CURL: Error Code(%s): %s';
+$_['error_curl']                    = 'CURL: Error Code(%s): %s';

upload/admin/language/en-gb/extension/analytics/google_analytics.php

@@ -1,4 +1,5 @@
 <?php
+// Heading
 $_['heading_title']    = 'Google Analytics';
 
 // Text
@@ -14,4 +15,4 @@
 
 // Error
 $_['error_permission'] = 'Warning: You do not have permission to modify Google Analytics!';
-$_['error_code']       = 'Code required!';
+$_['error_code']       = 'Code required!';

upload/admin/language/en-gb/extension/captcha/basic_captcha.php

@@ -1,13 +1,14 @@
 <?php
+// Heading
 $_['heading_title']    = 'Basic Captcha';
 
 // Text
 $_['text_extension']   = 'Extensions';
-$_['text_success']	   = 'Success: You have modified Basic Captcha!';
+$_['text_success']     = 'Success: You have modified Basic Captcha!';
 $_['text_edit']        = 'Edit Basic Captcha';
 
 // Entry
 $_['entry_status']     = 'Status';
 
 // Error
-$_['error_permission'] = 'Warning: You do not have permission to modify Basic Captcha!';
+$_['error_permission'] = 'Warning: You do not have permission to modify Basic Captcha!';

upload/admin/language/en-gb/extension/captcha/google_captcha.php

@@ -1,9 +1,10 @@
 <?php
+// Heading
 $_['heading_title']    = 'Google reCAPTCHA';
 
 // Text
 $_['text_captcha']     = 'Captcha';
-$_['text_success']	   = 'Success: You have modified Google reCAPTCHA!';
+$_['text_success']     = 'Success: You have modified Google reCAPTCHA!';
 $_['text_edit']        = 'Edit Google reCAPTCHA';
 $_['text_signup']      = 'Go to <a href="https://www.google.com/recaptcha/intro/index.html" target="_blank"><u>Google reCAPTCHA page</u></a> and register your website.';
 
@@ -14,5 +15,5 @@
 
 // Error
 $_['error_permission'] = 'Warning: You do not have permission to modify Google reCAPTCHA!';
-$_['error_key']	       = 'Key required!';
-$_['error_secret']	   = 'Secret required!';
+$_['error_key']        = 'Key required!';
+$_['error_secret']     = 'Secret required!';

upload/admin/language/en-gb/extension/dashboard/online.php

@@ -8,7 +8,6 @@
 $_['text_edit']        = 'Edit Dashboard Online';
 $_['text_view']        = 'View more...';
 
-
 // Entry
 $_['entry_status']     = 'Status';
 $_['entry_sort_order'] = 'Sort Order';

upload/admin/language/en-gb/extension/feed/google_base.php

@@ -22,4 +22,4 @@
 // Error
 $_['error_permission']       = 'Warning: You do not have permission to modify Google Base feed!';
 $_['error_upload']           = 'File could not be uploaded!';
-$_['error_filetype']         = 'Invalid file type!';
+$_['error_filetype']         = 'Invalid file type!';

upload/admin/language/en-gb/extension/fraud/fraudlabspro.php

@@ -34,7 +34,6 @@
 $_['text_flp_upgrade']           = '<a href="http://www.fraudlabspro.com/plan" target="_blank">[Upgrade]</a>';
 $_['text_flp_merchant_area']     = 'Please login to <a href="http://www.fraudlabspro.com/merchant/login" target="_blank">FraudLabs Pro Merchant Area</a> for more information about this order.';
 
-
 // Entry
 $_['entry_status']               = 'Status';
 $_['entry_key']                  = 'API Key';
@@ -77,4 +76,4 @@
 
 // Error
 $_['error_permission']           = 'Warning: You do not have permission to modify FraudLabs Pro settings!';
-$_['error_key']		             = 'API Key Required!';
+$_['error_key']                  = 'API Key Required!';

upload/admin/language/en-gb/extension/fraud/ip.php

@@ -24,4 +24,4 @@
 $_['help_order_status']  = 'Customers that have a banned IP on their accounts will be assigned this order status and will not be allowed to reach the complete status automatically.';
 
 // Error
-$_['error_permission']   = 'Warning: You do not have permission to modify Anti-Fraud IP!';
+$_['error_permission']   = 'Warning: You do not have permission to modify Anti-Fraud IP!';

upload/admin/language/en-gb/extension/fraud/maxmind.php

@@ -119,4 +119,4 @@
 
 // Error
 $_['error_permission']                        = 'Warning: You do not have permission to modify MaxMind anti-fraud!';
-$_['error_key']		                          = 'License Key Required!';
+$_['error_key']                               = 'License Key Required!';

upload/admin/language/en-gb/extension/installer.php

@@ -36,4 +36,4 @@
 $_['error_ftp_login']      = 'Could not login as %s';
 $_['error_ftp_root']       = 'Could not set root directory as %s';
 $_['error_ftp_directory']  = 'Could not change to directory %s';
-$_['error_ftp_file']       = 'Could not upload file %s';
+$_['error_ftp_file']       = 'Could not upload file %s';

upload/admin/language/en-gb/extension/module/divido_calculator.php

@@ -1,14 +1,14 @@
 <?php
 // Heading
-$_['heading_title']	   = 'Divido Product Page Calculator';
+$_['heading_title']    = 'Divido Product Page Calculator';
 
 // Text
 $_['text_extension']   = 'Extensions';
-$_['text_success']	   = 'Success: You have modified Divido Product Page Calculator!';
-$_['text_edit']		   = 'Edit Divido Product Page Calculator';
+$_['text_success']     = 'Success: You have modified Divido Product Page Calculator!';
+$_['text_edit']        = 'Edit Divido Product Page Calculator';
 
 // Entry
-$_['entry_status']	   = 'Status';
+$_['entry_status']     = 'Status';
 
 // Error
-$_['error_permission'] = 'Warning: You do not have permission to modify module Divido Product Page Calculator!';
+$_['error_permission'] = 'Warning: You do not have permission to modify module Divido Product Page Calculator!';

upload/admin/language/en-gb/extension/payment/bank_transfer.php

@@ -1,22 +1,22 @@
 <?php
 // Heading
-$_['heading_title']		 = 'Bank Transfer';
+$_['heading_title']      = 'Bank Transfer';
 
 // Text
-$_['text_extension']	 = 'Extensions';
-$_['text_success']		 = 'Success: You have modified bank transfer details!';
+$_['text_extension']     = 'Extensions';
+$_['text_success']       = 'Success: You have modified bank transfer details!';
 $_['text_edit']          = 'Edit Bank Transfer';
 
 // Entry
-$_['entry_bank']		 = 'Bank Transfer Instructions';
-$_['entry_total']		 = 'Total';
+$_['entry_bank']         = 'Bank Transfer Instructions';
+$_['entry_total']        = 'Total';
 $_['entry_order_status'] = 'Order Status';
-$_['entry_geo_zone']	 = 'Geo Zone';
-$_['entry_status']		 = 'Status';
-$_['entry_sort_order']	 = 'Sort Order';
+$_['entry_geo_zone']     = 'Geo Zone';
+$_['entry_status']       = 'Status';
+$_['entry_sort_order']   = 'Sort Order';
 
 // Help
-$_['help_total']		 = 'The checkout total the order must reach before this payment method becomes active.'; 
+$_['help_total']         = 'The checkout total the order must reach before this payment method becomes active.'; 
 
 // Error 
 $_['error_permission']   = 'Warning: You do not have permission to modify payment bank transfer!';