Merge branch 'v3.1' into v3.1.0-aplha

This commit is contained in:
Akolzin Dmitry 2018-09-27 17:03:29 +03:00 committed by GitHub
commit 260cb713ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 135 additions and 47 deletions

View File

@ -1,3 +1,7 @@
## v.3.1.2
* Добавлен перевод на испанский язык
* Переделан перевод на английский язык
## v.3.1.1 ## v.3.1.1
* Добавлено создание клиента при ручной выгрузке заказа из админки * Добавлено создание клиента при ручной выгрузке заказа из админки

View File

@ -6,76 +6,77 @@ $_['retailcrm_title'] = 'Retailcrm';
// Text // Text
$_['text_module'] = 'Modules'; $_['text_module'] = 'Modules';
$_['text_success'] = 'Setting saved'; $_['text_success'] = 'Settings are saved successfully';
$_['text_notice'] = 'Warning! Timezone in CRM & your shop must be equal, you must setup it here:'; $_['text_notice'] = 'Attention! Time zone in CRM should be the same as the time zone of the store, the time zone is set up at';
$_['retailcrm_base_settings'] = 'Connection settings'; $_['retailcrm_base_settings'] = 'Connection settings';
$_['retailcrm_dict_settings'] = 'Dictionary settings'; $_['retailcrm_dict_settings'] = 'Configuration of directories correspondence';
$_['retailcrm_countries_settings'] = 'Trading zones setting'; $_['retailcrm_countries_settings'] = 'Setting of trade zones';
$_['retailcrm_upload_order'] = 'Unload single order'; $_['retailcrm_upload_order'] = 'Uploading one order';
$_['daemon_collector'] = 'Daemon Collector'; $_['daemon_collector'] = 'Daemon Collector';
$_['general_tab_text'] = 'General'; $_['general_tab_text'] = 'Main';
$_['references_tab_text'] = 'References'; $_['references_tab_text'] = 'Directories';
$_['collector_tab_text'] = 'Daemon Collector'; $_['collector_tab_text'] = 'Daemon Collector';
$_['logs_tab_text'] = 'Logs'; $_['logs_tab_text'] = 'Logs';
$_['collector_custom_text'] = 'Custom form'; $_['collector_custom_text'] = 'Configuration of form fields';
$_['custom_fields_tab_text'] = 'Custom fields'; $_['custom_fields_tab_text'] = 'Custom fields';
$_['retailcrm_apiversion'] = 'API Version'; $_['retailcrm_apiversion'] = 'API Version';
$_['retailcrm_url'] = 'RetailCRM URL'; $_['retailcrm_url'] = 'URL of retailCRM';
$_['retailcrm_apikey'] = 'RetailCRM API Key'; $_['retailcrm_apikey'] = 'API key of retailCRM';
$_['collector_site_key'] = 'Site key'; $_['collector_site_key'] = 'Site key';
$_['special_price_settings'] = 'Settings specials'; $_['special_price_settings'] = 'Setting of uploading promotion price';
$_['special_price'] = 'The type of price at which the share price will be unloaded'; $_['special_price'] = 'Price type to which the promotion price will be uploaded';
$_['text_success_export'] = 'Orders and customers successfully unloaded';
$_['text_success_export_order'] = 'Order successfully unloaded'; $_['text_success_export'] = 'Orders and customers are uploaded successfully';
$_['text_button_export'] = 'Unload all orders and customers'; $_['text_success_export_order'] = 'Order is uploaded successfully';
$_['text_button_export_order'] = 'Unload order'; $_['text_button_export'] = 'Upload all orders and customers';
$_['text_button_catalog'] = 'Unload catalog'; $_['text_button_export_order'] = 'Upload the order';
$_['text_button_catalog'] = 'Upload the catalogue';
$_['text_button_clear'] = 'Clear'; $_['text_button_clear'] = 'Clear';
$_['text_success_catalog'] = 'Catalog successfully unloaded'; $_['text_success_catalog'] = 'Catalogue is uploaded successfully';
$_['text_error_order'] = 'Error! Order is not unloaded!'; $_['text_error_order'] = 'Error! Order is not uploaded!';
$_['text_error_order_id'] = 'Error! Enter the correct order number!'; $_['text_error_order_id'] = 'Error! Enter the correct order number!';
$_['text_collector_activity'] = 'Use Daemon Collector'; $_['text_collector_activity'] = 'Use Daemon Collector';
$_['text_custom_field_activity'] = 'Send custom fields'; $_['text_custom_field_activity'] = 'Transfer custom fields';
$_['text_collector_form_capture']= 'Show capture form'; $_['text_collector_form_capture']= 'Show a capture form';
$_['text_collector_period'] = 'Form show period (in minutes)'; $_['text_collector_period'] = 'Frequency of the form popping up (in minutes)';
$_['text_label_promo'] = 'Text form title'; $_['text_label_promo'] = 'Form header text';
$_['text_label_send'] = 'Text button'; $_['text_label_send'] = 'Button text';
$_['field_name'] = 'Name'; $_['field_name'] = 'Name';
$_['field_email'] = 'Email'; $_['field_email'] = 'E-mail';
$_['field_phone'] = 'Phone'; $_['field_phone'] = 'Phone';
$_['text_require'] = 'Require'; $_['text_require'] = 'Required for filling in';
$_['text_payment'] = 'Payment'; $_['text_payment'] = 'Payment';
$_['text_shipping'] = 'Shipping'; $_['text_shipping'] = 'Delivery';
$_['text_orders_custom_fields'] = 'Orders custom fields'; $_['text_orders_custom_fields'] = 'Custom fields of orders';
$_['text_customers_custom_fields'] = 'Customers custom fields'; $_['text_customers_custom_fields'] = 'Custom fields of customers';
$_['text_error_collector_fields']= 'Fill in the field names Daemon Collector'; $_['text_error_collector_fields']= 'Fill in the names of fields of Demon Collector form';
$_['text_error_api'] = 'The selected version of the API is unavailable'; $_['text_error_api'] = 'The selected API version is not available.';
$_['text_error_custom_field'] = 'Create custom fields for customer in Opencart and RetailCRM, that to configure their transmission'; $_['text_error_custom_field'] = 'Create custom fields on a customer page in Opencart and retailCRM in order to set up their transfer';
$_['text_error_cf_opencart'] = 'None custom fields in Opencart'; $_['text_error_cf_opencart'] = 'There are no custom fields in Opencart';
$_['text_error_cf_retailcrm'] = 'None custom fields in RetailCRM'; $_['text_error_cf_retailcrm'] = 'There are no custom fields in retailCRM';
$_['text_error_save'] = 'Error saving settings'; $_['text_error_save'] = 'Error when saving settings';
$_['text_error_log'] = 'Log size more than 2MB'; $_['text_error_log'] = 'Log size is more than 2MB';
$_['text_error_delivery'] = 'Not found delivery methods'; $_['text_error_delivery'] = 'Delivery types are not found';
$_['text_confirm_log'] = 'Are you sure you want to clear the log?'; $_['text_confirm_log'] = 'Are you sure that you want to clear the log?';
$_['retailcrm_dict_delivery'] = 'Shipment methods'; $_['retailcrm_dict_delivery'] = 'Delivery types';
$_['retailcrm_dict_status'] = 'Order statuses'; $_['retailcrm_dict_status'] = 'Statuses';
$_['retailcrm_dict_payment'] = 'Payment methods'; $_['retailcrm_dict_payment'] = 'Payment methods';
$_['retailcrm_dict_custom_fields'] = 'Configure custom fields'; $_['retailcrm_dict_custom_fields'] = 'Configuration of custom fields';
$_['retailcrm_dict_default'] = 'Default'; $_['retailcrm_dict_default'] = 'By default';
$_['retailcrm_missing_status'] = 'Missing orders status'; $_['retailcrm_missing_status'] = 'Status of lost orders';
$_['order_number'] = 'Order number'; $_['order_number'] = 'Order number';
$_['text_order_number'] = 'Transfer order number to retailCRM'; $_['text_order_number'] = 'Upload the order number to retailCRM';
$_['debug'] = 'Debug mode'; $_['debug'] = 'Debug mode';
$_['text_debug'] = 'Enable debug mode'; $_['text_debug'] = 'Enable debug mode';
$_['column_total'] = 'Total'; $_['column_total'] = 'Total';
$_['product_summ'] = 'Amount'; $_['product_summ'] = 'Sum';
$_['article'] = 'SKU'; $_['article'] = 'Article';
$_['color'] = 'Color'; $_['color'] = 'Color';
$_['weight'] = 'Weight'; $_['weight'] = 'Weight';
$_['size'] = 'Size'; $_['size'] = 'Size';
@ -83,4 +84,4 @@ $_['size'] = 'Size';
$_['text_yes'] = 'Yes'; $_['text_yes'] = 'Yes';
$_['text_no'] = 'No'; $_['text_no'] = 'No';
// Errors // Errors
$_['error_permission'] = 'Warning! You do not have permission to modify module'; $_['error_permission'] = 'You do not have rights for changing the module settings';

View File

@ -0,0 +1,83 @@
<?php
// Heading Goes here:
$_['heading_title'] = 'retailcrm';
$_['retailcrm_title'] = 'retailcrm';
// Text
$_['text_module'] = 'Módulos';
$_['text_success'] = 'Ajustes guardados correctamente';
$_['text_notice'] = '¡Atención! La zona horaria de CRM debe coincidir con la zona horaria de la tienda, la configuración de la zona horaria de CRM se puede establecer en:';
$_['retailcrm_base_settings'] = 'Ajustes de conexión';
$_['retailcrm_dict_settings'] = 'Ajustes de coincidencia de directorios';
$_['retailcrm_countries_settings'] = 'Configurar zonas comerciales';
$_['retailcrm_upload_order'] = 'Exportación de un pedido';
$_['daemon_collector'] = 'Daemon Collector';
$_['general_tab_text'] = 'Inicio';
$_['references_tab_text'] = 'Directorios';
$_['collector_tab_text'] = 'Daemon Collector';
$_['logs_tab_text'] = 'Registro';
$_['collector_custom_text'] = 'Configurar campos de formulario';
$_['custom_fields_tab_text'] = 'Campos personalizados';
$_['retailcrm_apiversion'] = 'Versión de la API';
$_['retailcrm_url'] = 'Dirección del retailCRM';
$_['retailcrm_apikey'] = 'Clave de la API del retailCRM';
$_['collector_site_key'] = 'Clave de la página web';
$_['special_price_settings'] = 'Ajuste de la descarga del precio promocional';
$_['special_price'] = 'Tipo de precio en el que se cargará el precio de promoción';
$_['text_success_export'] = 'Los pedidos y los clientes han sido exportados con éxito';
$_['text_success_export_order'] = 'El pedido ha sido exportado con éxito';
$_['text_button_export'] = 'Exportar a todos los pedidos y clientes';
$_['text_button_export_order'] = 'Exportar pedidos';
$_['text_button_catalog'] = 'Exportar catálogo';
$_['text_button_clear'] = 'Limpiar';
$_['text_success_catalog'] = 'El catálogo ha sido exportado con éxito';
$_['text_error_order'] = '¡Error! ¡El pedido no se ha exportado!';
$_['text_error_order_id'] = '¡Error! ¡Introduzca el número del pedido correcto!';
$_['text_collector_activity'] = 'Usar Daemon Collector';
$_['text_custom_field_activity'] = 'Transmitir campos personalizados';
$_['text_collector_form_capture']= 'Mostrar el formulario de captura';
$_['text_collector_period'] = 'Frecuencia de la oleada del formulario (en minutos)';
$_['text_label_promo'] = 'Texto del título del formulario';
$_['text_label_send'] = 'Texto del botón';
$_['field_name'] = 'Nombre';
$_['field_email'] = 'Email';
$_['field_phone'] = 'Teléfono';
$_['text_require'] = 'Necesario para rellenar';
$_['text_payment'] = 'Pago';
$_['text_shipping'] = 'Envío';
$_['text_orders_custom_fields'] = 'Los campos de pedidos personalizados';
$_['text_customers_custom_fields'] = 'Los campos de clientes personalizados';
$_['text_error_collector_fields']= 'Rellene los nombres de los campos del formulario Daemon Collector';
$_['text_error_api'] = 'La versión seleccionada de la API no está disponible.';
$_['text_error_custom_field'] = 'Cree campos personalizados en la ficha del cliente en Opencart y retailCRM para configurar sus transmisión.';
$_['text_error_cf_opencart'] = 'Faltan campos personalizados en Opencart';
$_['text_error_cf_retailcrm'] = 'Faltan campos personalizados en retailCRM';
$_['text_error_save'] = 'Error al guardar la configuración';
$_['text_error_log'] = 'El Tamaño del registro es más de 2MB';
$_['text_error_delivery'] = 'No se encontraron los métodos de envío';
$_['text_confirm_log'] = '¿Estás seguro de que quieres borrar el registro?';
$_['retailcrm_dict_delivery'] = 'Métodos de envío';
$_['retailcrm_dict_status'] = 'Estados';
$_['retailcrm_dict_payment'] = 'Métodos de pago';
$_['retailcrm_dict_custom_fields'] = 'Configurar campos personalizados';
$_['retailcrm_dict_default'] = 'Por defecto';
$_['retailcrm_missing_status'] = 'Estado de pedidos perdidos';
$_['order_number'] = 'Número de pedido';
$_['text_order_number'] = 'Transferir número de pedido a retailCRM';
$_['column_total'] = 'Total';
$_['product_summ'] = 'Importe';
$_['article'] = 'Artículo';
$_['color'] = 'Color';
$_['weight'] = 'Peso';
$_['size'] = 'Tamaño';
$_['text_yes'] = 'Sí';
$_['text_no'] = 'No';
// Errors
$_['error_permission'] = 'No tiene suficientes permisos para cambiar la configuración del módulo';