From 862a992bc6d155b113e79d2a5ce1c42238b4753a Mon Sep 17 00:00:00 2001 From: ocshop Date: Sat, 29 Nov 2014 17:18:20 +0200 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../language/russian/extension/openbay.php | 26 ++++++++++++++++--- .../russian/openbay/ebay_settings.php | 1 - 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/upload/admin/language/russian/extension/openbay.php b/upload/admin/language/russian/extension/openbay.php index 208eb9b54d5..c1cf5782bf3 100644 --- a/upload/admin/language/russian/extension/openbay.php +++ b/upload/admin/language/russian/extension/openbay.php @@ -11,7 +11,10 @@ // Tab $_['tab_setting'] = 'Settings'; -$_['tab_update'] = 'Updates'; +$_['tab_update'] = 'Software updates'; +$_['tab_update_v1'] = 'Easy updater'; +$_['tab_update_v2'] = 'Legacy updater'; +$_['tab_patch'] = 'Patch'; $_['tab_developer'] = 'Developer'; // Text @@ -36,7 +39,8 @@ $_['text_patch_complete'] = 'Patch has been applied'; $_['text_connection_ok'] = 'Connected to server OK. OpenCart folders found'; $_['text_updated'] = 'Module has been updated (v.%s)'; -$_['text_update_description'] = "The update tool will make changes to your shop's file system. Make sure you have a backup before using this tool."; +$_['text_update_description'] = "The update tool will make changes to your shop file system. Make sure you have a complete file and database backup before updating."; +$_['text_patch_description'] = 'If you uploaded the update files manually, you need to run the patch to complete the update'; $_['text_clear_faq'] = 'Clear hidden FAQ popups'; $_['text_clear_faq_complete'] = 'Notifications will now show again'; $_['text_install_success'] = 'Marketplace has been installed'; @@ -44,6 +48,16 @@ $_['text_title_messages'] = 'Messages & notifications'; $_['text_marketplace_shipped'] = 'The order status will be updated to shipped on the marketplace'; $_['text_action_warning'] = 'This action is dangerous so is password protected.'; +$_['text_check_new'] = 'Checking for newer version'; +$_['text_downloading'] = 'Downloading update files'; +$_['text_extracting'] = 'Extracting files'; +$_['text_running_patch'] = 'Running patch files'; +$_['text_fail_patch'] = 'Unable to extract update files'; +$_['text_updated_ok'] = 'Update complete, installed version is now '; +$_['text_check_server'] = 'Checking server requirements'; +$_['text_version_ok'] = 'Software is already up to date, installed version is '; +$_['text_remove_files'] = 'Removing files no longer required'; +$_['text_confirm_backup'] = 'Ensure that you have a full backup before continuing'; // Column $_['column_name'] = 'Plugin name'; @@ -64,6 +78,7 @@ $_['entry_tracking'] = 'Tracking #'; $_['entry_empty_data'] = 'Empty store data?'; $_['entry_password_prompt'] = 'Please enter the data wipe password'; +$_['entry_update'] = 'Easy 1 click update'; // Error $_['error_username'] = 'FTP username required'; @@ -79,6 +94,8 @@ $_['error_tracking_courier'] = 'You must select a courier if you want to add a tracking ID'; $_['error_tracking_custom'] = 'Please leave courier field empty if you want to use custom courier'; $_['error_permission'] = 'You do not have permission to modify the OpenBay Pro extension'; +$_['error_mkdir'] = 'PHP mkdir function is disabled, contact your host'; +$_['error_file_delete'] = 'Unable to remove these files, you should delete them manually'; // Help $_['help_ftp_username'] = 'Use the FTP username from your host'; @@ -88,6 +105,7 @@ $_['help_ftp_admin'] = 'If you have changed your admin directory update it to the new location'; $_['help_ftp_pasv'] = 'Change your FTP connection to passive mode'; $_['help_ftp_beta'] = 'Caution! The beta version may not work correctly'; -$_['help_patch'] = 'If you updated your files directly through FTP (not using the update system above) you need to run the patch to complete the update'; $_['help_clear_faq'] = 'Show all of the help notifications again'; -$_['help_empty_data'] = 'This can cause serious damage, do not use it if you do not know what it does!'; \ No newline at end of file +$_['help_empty_data'] = 'This can cause serious damage, do not use it if you do not know what it does!'; +$_['help_easy_update'] = 'Click update to install the latest version of OpenBay Pro automatically'; +$_['help_patch'] = 'Click to run the patch scripts'; \ No newline at end of file diff --git a/upload/admin/language/russian/openbay/ebay_settings.php b/upload/admin/language/russian/openbay/ebay_settings.php index 47e6ea81515..80403c0b9b1 100644 --- a/upload/admin/language/russian/openbay/ebay_settings.php +++ b/upload/admin/language/russian/openbay/ebay_settings.php @@ -55,7 +55,6 @@ $_['entry_disable_soldout'] = 'Disable product when no stock?'; $_['entry_debug'] = 'Enable logging'; $_['entry_currency'] = 'Default currency'; -$_['entry_customer_group'] = 'Customer group'; $_['entry_stock_allocate'] = 'Allocate stock'; $_['entry_created_hours'] = 'New order age limit'; $_['entry_developer_locks'] = 'Remove order locks?';