From 4bd790f56af143edfc5a36bacb464fc2bc8ea96c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christer=20War=C3=A9n?= Date: Fri, 8 Oct 2021 18:17:57 +0300 Subject: [PATCH] OpenCart 3.0.3.8 --- admin/common/column_left.php | 14 -- admin/common/login.php | 1 + admin/common/security.php | 5 +- admin/design/seo_url.php | 15 +- admin/extension/extension/module.php | 1 + admin/extension/fraud/fraudlabspro.php | 2 + .../extension/module/paypal_smart_button.php | 67 +++++++++ admin/extension/module/store.php | 3 + admin/extension/payment/amazon_login_pay.php | 19 ++- admin/extension/payment/bluepay_hosted.php | 2 + admin/extension/payment/bluepay_redirect.php | 3 + admin/extension/payment/cardconnect.php | 1 + admin/extension/payment/cardinity.php | 5 +- admin/extension/payment/eway.php | 1 + admin/extension/payment/firstdata_remote.php | 3 + admin/extension/payment/g2apay.php | 1 + admin/extension/payment/globalpay.php | 3 + admin/extension/payment/globalpay_remote.php | 3 + admin/extension/payment/paypal.php | 138 ++++++++++++++++++ admin/extension/payment/pp_express.php | 39 ++--- admin/extension/payment/pp_payflow.php | 4 +- admin/extension/payment/pp_payflow_iframe.php | 4 +- admin/extension/payment/pp_pro.php | 4 +- admin/extension/payment/pp_pro_iframe.php | 4 +- admin/extension/payment/pp_standard.php | 4 +- admin/extension/payment/realex.php | 3 + admin/extension/payment/realex_remote.php | 3 + admin/extension/payment/sagepay_direct.php | 3 + admin/extension/payment/sagepay_server.php | 3 + admin/extension/payment/securetrading_pp.php | 6 + admin/extension/payment/securetrading_ws.php | 3 + admin/extension/payment/worldpay.php | 2 + admin/extension/report/marketing.php | 1 - admin/extension/report/sale_order.php | 3 +- admin/extension/report/sale_return.php | 1 - admin/extension/report/sale_shipping.php | 1 - admin/extension/report/sale_tax.php | 1 - admin/mail/voucher.php | 1 + admin/marketing/contact.php | 3 +- admin/marketplace/marketplace.php | 2 + admin/sale/voucher.php | 1 - admin/setting/setting.php | 3 +- admin/tool/upload.php | 2 + admin/user/api.php | 2 +- catalog/account/address.php | 1 + catalog/checkout/cart.php | 1 - .../extension/module/divido_calculator.php | 3 +- .../extension/module/paypal_smart_button.php | 74 ++++++++++ catalog/extension/module/pilibaba_button.php | 7 + .../extension/payment/amazon_login_pay.php | 5 + catalog/extension/payment/divido.php | 1 + catalog/extension/payment/eway.php | 10 +- .../extension/payment/firstdata_remote.php | 1 + catalog/extension/payment/klarna_account.php | 2 + catalog/extension/payment/klarna_checkout.php | 3 +- catalog/extension/payment/klarna_invoice.php | 2 + catalog/extension/payment/paypal.php | 28 ++++ catalog/information/contact.php | 2 +- catalog/product/product.php | 1 + install/en-gb.php | 7 + install/install/step_2.php | 4 +- install/install/step_3.php | 6 +- install/install/step_4.php | 2 - 63 files changed, 461 insertions(+), 89 deletions(-) create mode 100644 admin/extension/module/paypal_smart_button.php create mode 100644 admin/extension/payment/paypal.php create mode 100644 catalog/extension/module/paypal_smart_button.php create mode 100644 catalog/extension/module/pilibaba_button.php create mode 100644 catalog/extension/payment/paypal.php create mode 100644 install/en-gb.php diff --git a/admin/common/column_left.php b/admin/common/column_left.php index 4c1c8e8..f9e1536 100644 --- a/admin/common/column_left.php +++ b/admin/common/column_left.php @@ -71,20 +71,6 @@ $_['text_length_class'] = 'Length Classes'; $_['text_zone'] = 'Zones'; $_['text_recurring'] = 'Recurring Profiles'; $_['text_order_recurring'] = 'Recurring Orders'; -$_['text_openbay_extension'] = 'OpenBay Pro'; -$_['text_openbay_dashboard'] = 'Dashboard'; -$_['text_openbay_orders'] = 'Bulk order update'; -$_['text_openbay_items'] = 'Manage items'; -$_['text_openbay_ebay'] = 'eBay'; -$_['text_openbay_amazon'] = 'Amazon (EU)'; -$_['text_openbay_amazonus'] = 'Amazon (US)'; -$_['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'; diff --git a/admin/common/login.php b/admin/common/login.php index d03b6a3..6b9977b 100644 --- a/admin/common/login.php +++ b/admin/common/login.php @@ -17,3 +17,4 @@ $_['button_login'] = 'Kirjaudu'; // Error $_['error_login'] = 'No match for Username and/or Password.'; $_['error_token'] = 'Invalid token session. Please login again.'; +$_['error_attempts'] = 'Warning: Your account has exceeded allowed number of login attempts. Please try again in 1 hour or reset password.'; diff --git a/admin/common/security.php b/admin/common/security.php index d7aea47..5f42b68 100644 --- a/admin/common/security.php +++ b/admin/common/security.php @@ -5,7 +5,7 @@ $_['heading_title'] = 'Important Security Notification!'; // Text $_['text_success'] = 'Success: You have modified the storage folder!'; $_['text_admin'] = 'Edit admin/config.php and change'; -$_['text_security'] = 'It is very imporant that you move the storage directory outside of the web directory (e.g. public_html, www or htdocs).'; +$_['text_security'] = 'It is very important that you move the storage directory outside of the web directory (e.g. public_html, www or htdocs).'; $_['text_choose'] = 'Choose how to move the storage directory'; $_['text_automatic'] = 'Automatically Move'; $_['text_manual'] = 'Manually Move'; @@ -14,6 +14,9 @@ $_['text_to'] = 'to'; $_['text_config'] = 'Edit config.php change'; $_['text_admin'] = 'Edit admin/config.php and change'; +// Entry +$_['entry_directory'] = 'Directory'; + // Button $_['button_move'] = 'Move'; $_['button_manual'] = 'Manual'; diff --git a/admin/design/seo_url.php b/admin/design/seo_url.php index e6e1efc..02d1102 100644 --- a/admin/design/seo_url.php +++ b/admin/design/seo_url.php @@ -18,13 +18,14 @@ $_['column_language'] = 'Language'; $_['column_action'] = 'Toiminto'; // Entry -$_['entry_query'] = 'Query'; -$_['entry_keyword'] = 'Keyword'; -$_['entry_store'] = 'Store'; -$_['entry_language'] = 'Language'; +$_['entry_query'] = 'Query'; +$_['entry_keyword'] = 'Keyword'; +$_['entry_store'] = 'Store'; +$_['entry_language'] = 'Language'; // Error $_['error_permission'] = 'Varoitus: You do not have permission to modify SEO URL!'; -$_['error_query'] = 'Query must be between 3 and 64 characters!'; -$_['error_keyword'] = 'Keyword must be between 3 and 64 characters!'; -$_['error_exists'] = 'Keyword already in use!'; +$_['error_query'] = 'Query must be between 3 and 64 characters!'; +$_['error_keyword'] = 'Keyword must be between 3 and 64 characters!'; +$_['error_exists'] = 'Keyword already in use!'; +$_['error_query_exists'] = 'Query already in use!'; diff --git a/admin/extension/extension/module.php b/admin/extension/extension/module.php index bafcf01..766b1c3 100644 --- a/admin/extension/extension/module.php +++ b/admin/extension/extension/module.php @@ -20,4 +20,5 @@ $_['entry_name'] = 'Module Name'; // Error $_['error_permission'] = 'Varoitus: You do not have permission to modify modules!'; $_['error_name'] = 'Module Name must be between 3 and 64 characters!'; +$_['error_code_name'] = 'Module Code must be between 3 and 32 characters!'; $_['error_code'] = 'Extension required!'; \ No newline at end of file diff --git a/admin/extension/fraud/fraudlabspro.php b/admin/extension/fraud/fraudlabspro.php index 9dff3eb..24f9e60 100644 --- a/admin/extension/fraud/fraudlabspro.php +++ b/admin/extension/fraud/fraudlabspro.php @@ -33,6 +33,8 @@ $_['text_credits'] = 'Balance'; $_['text_error'] = 'Error:'; $_['text_flp_upgrade'] = '[Upgrade]'; $_['text_flp_merchant_area'] = 'Please login to FraudLabs Pro Merchant Area for more information about this order.'; +$_['text_rule_validation'] = 'Rules Validation'; +$_['text_testing'] = 'Testing Purpose'; // Entry $_['entry_status'] = 'Status'; diff --git a/admin/extension/module/paypal_smart_button.php b/admin/extension/module/paypal_smart_button.php new file mode 100644 index 0000000..0c6aaad --- /dev/null +++ b/admin/extension/module/paypal_smart_button.php @@ -0,0 +1,67 @@ +Amazon Pay and Login with Amazon'; -$_['text_amazon_join'] = 'Sign-up to Amazon Pay'; +$_['text_amazon_login_pay'] = 'Amazon Pay and Login with Amazon'; +$_['text_amazon_join'] = 'Sign-up to Amazon Pay'; $_['text_payment_info'] = 'Payment information'; $_['text_capture_ok'] = 'Capture was successful'; $_['text_capture_ok_order'] = 'Capture was successful, authorization has been fully captured'; @@ -63,6 +63,7 @@ $_['text_confirm_capture'] = 'Are you sure you want to capture the payment?'; $_['text_confirm_refund'] = 'Are you sure you want to refund the payment?'; $_['text_minimum_total'] = 'Minimum Order Total'; $_['text_geo_zone'] = 'Geo Zone'; +$_['text_buyer_multi_currency'] = 'Multi-Currency function'; $_['text_status'] = 'Status'; $_['text_declined_codes'] = 'Test Decline Codes'; $_['text_sort_order'] = 'Sort Order'; @@ -75,6 +76,7 @@ $_['text_credentials'] = 'Please paste your keys here (in JSON format)'; $_['text_validate_credentials'] = 'Validate and Use Credentials'; $_['text_extension'] = 'Extensions'; $_['text_info_ssl'] = 'Important: SSL (https://) is a requirement and must be enabled on your website for the Amazon Pay and Login with Amazon buttons to work.'; +$_['text_info_buyer_multi_currencies'] = 'This extension supports the Multi-Currency functionality. If you would like to use it, please make sure you have enabled at least one of the Amazon Pay supported currencies in your on-line store settings (%s > %s > %s ), and then enable the Multi-Currency function'; // Columns $_['column_status'] = 'Status'; @@ -85,26 +87,30 @@ $_['entry_access_key'] = 'Access Key'; $_['entry_access_secret'] = 'Secret Key'; $_['entry_client_id'] = 'Client ID'; $_['entry_client_secret'] = 'Client Secret'; -$_['entry_language'] = 'Language'; +$_['entry_language'] = 'Default Language'; $_['entry_login_pay_test'] = 'Test mode'; $_['entry_login_pay_mode'] = 'Payment mode'; $_['entry_checkout'] = 'Checkout mode'; $_['entry_payment_region'] = 'Payment Region'; -$_['entry_capture_status'] = 'Automatic capture status'; +$_['entry_capture_status'] = 'Status for automatic capture'; $_['entry_pending_status'] = 'Pending Order Status'; +$_['entry_capture_oc_status'] = 'Capture Order Status'; $_['entry_ipn_url'] = 'IPN\'s URL'; $_['entry_ipn_token'] = 'Secret Token'; $_['entry_debug'] = 'Debug logging'; // Help -$_['help_pay_mode'] = 'Payment is only available for US marketplace'; +$_['help_pay_mode'] = 'Choose Payment if you would like the payment to get captured automatically, or Authorization to capture it manually.'; $_['help_checkout'] = 'Should payment button also login customer'; -$_['help_capture_status'] = 'Choose order staus that will trigger automatic capture of an authorized payment'; +$_['help_capture_status'] = 'Choose the order status that will trigger automatic capture of an authorized payment.'; +$_['help_capture_oc_status'] = 'Choose the order status that the order will get once it is captured in Amazon Seller Central or from the capture function in OpenCart Admin > %s > %s > %s.'; $_['help_ipn_url'] = 'Set this as you merhcant URL in Amazon Seller Central'; $_['help_ipn_token'] = 'Make this long and hard to guess. The resulting IPN URL must not be longer than 150 characters.'; $_['help_minimum_total'] = 'This must be above zero'; $_['help_debug'] = 'Enabling debug will write sensitive data to a log file. You should always disable unless instructed otherwise'; $_['help_declined_codes'] = 'This is for testing purposes only'; +$_['help_buyer_multi_currency'] = 'Enable this option if you would like the buyer to shop in any of the Amazon Pay supported currencies available in your on-line store: %s'; +$_['help_buyer_multi_currency_no_available_currency'] = 'There are no Amazon Pay supported currencies available in your on-line store, please add/enable such currencies in order to use this functionality.'; // Order Info $_['tab_order_adjustment'] = 'Order Adjustment'; @@ -122,6 +128,7 @@ $_['error_curreny'] = 'Your shop must have %s currency installed $_['error_upload'] = 'Upload failed'; $_['error_data_missing'] = 'Required data is missing'; $_['error_credentials'] = 'Please enter the keys in a valid JSON format'; +$_['error_no_supported_currencies'] = 'There are no supported currencies available in your store, please add/enable Buyer Multi-Currency supported currencies in order to use this feature.'; // Buttons $_['button_capture'] = 'Capture'; diff --git a/admin/extension/payment/bluepay_hosted.php b/admin/extension/payment/bluepay_hosted.php index 3892b7c..b2ec242 100644 --- a/admin/extension/payment/bluepay_hosted.php +++ b/admin/extension/payment/bluepay_hosted.php @@ -30,6 +30,8 @@ $_['text_column_date_added'] = 'Date Added'; $_['text_confirm_void'] = 'Are you sure you want to void the payment?'; $_['text_confirm_release'] = 'Are you sure you want to release the payment?'; $_['text_confirm_rebate'] = 'Are you sure you want to rebate the payment?'; +$_['text_payment'] = "Payment"; +$_['text_rebate'] = "Rebate"; // Entry $_['entry_account_name'] = 'Account Name'; diff --git a/admin/extension/payment/bluepay_redirect.php b/admin/extension/payment/bluepay_redirect.php index d5c5972..52096ca 100644 --- a/admin/extension/payment/bluepay_redirect.php +++ b/admin/extension/payment/bluepay_redirect.php @@ -31,6 +31,9 @@ $_['text_column_date_added'] = 'Created'; $_['text_confirm_void'] = 'Are you sure you want to void the payment?'; $_['text_confirm_release'] = 'Are you sure you want to release the payment?'; $_['text_confirm_rebate'] = 'Are you sure you want to rebate the payment?'; +$_['text_void'] = 'Void'; +$_['text_payment'] = 'Payment'; +$_['text_rebate'] = 'Rebate'; // Entry $_['entry_vendor'] = 'Account ID'; diff --git a/admin/extension/payment/cardconnect.php b/admin/extension/payment/cardconnect.php index 53fbe49..1a5c0bf 100644 --- a/admin/extension/payment/cardconnect.php +++ b/admin/extension/payment/cardconnect.php @@ -12,6 +12,7 @@ $_['text_success'] = 'Success: You have modified CardConnect pa $_['text_edit'] = 'Edit CardConnect'; $_['text_cardconnect'] = 'CardConnect'; $_['text_payment'] = 'Payment'; +$_['text_refund'] = 'Refund'; $_['text_authorize'] = 'Authorize'; $_['text_live'] = 'Live'; $_['text_test'] = 'Test'; diff --git a/admin/extension/payment/cardinity.php b/admin/extension/payment/cardinity.php index 402e3ed..019dc38 100644 --- a/admin/extension/payment/cardinity.php +++ b/admin/extension/payment/cardinity.php @@ -15,6 +15,8 @@ $_['text_confirm_refund'] = 'Are you sure you want to refund'; $_['text_na'] = 'N/A'; $_['text_success_action'] = 'Success'; $_['text_error_generic'] = 'Error: There was an error with your request. Please check the logs.'; +$_['text_amount'] = 'Amount'; +$_['text_description'] = 'Description'; // Column $_['column_refund'] = 'Refund'; @@ -49,4 +51,5 @@ $_['error_composer'] = 'Unable to load Cardinity SDK. Please download a compile $_['error_php_version'] = 'Minimum version of PHP 5.4.0 is required!'; $_['error_permission'] = 'Varoitus: You do not have permission to modify payment Cardinity!'; $_['error_connection'] = 'There was a problem establishing a connection to the Cardinity API. Please check your Key and Secret settings.'; -$_['error_warning'] = 'Varoitus: Please check the form carefully for errors!'; \ No newline at end of file +$_['error_transaction'] = 'Unable to find transaction for this order.'; +$_['error_warning'] = 'Varoitus: Please check the form carefully for errors!'; diff --git a/admin/extension/payment/eway.php b/admin/extension/payment/eway.php index 4f636bf..93d04ff 100644 --- a/admin/extension/payment/eway.php +++ b/admin/extension/payment/eway.php @@ -59,6 +59,7 @@ $_['text_capture_success'] = 'Capture succeeded!'; $_['text_refund_failed'] = 'Refund failed: '; $_['text_capture_failed'] = 'Capture failed: '; $_['text_unknown_failure'] = 'Invalid order or amount'; +$_['text_refund'] = 'Refund'; $_['text_confirm_capture'] = 'Are you sure you want to capture the payment?'; $_['text_confirm_release'] = 'Are you sure you want to release the payment?'; diff --git a/admin/extension/payment/firstdata_remote.php b/admin/extension/payment/firstdata_remote.php index e9dd114..154eca7 100644 --- a/admin/extension/payment/firstdata_remote.php +++ b/admin/extension/payment/firstdata_remote.php @@ -38,6 +38,9 @@ $_['text_column_date_added'] = 'Created'; $_['text_confirm_void'] = 'Are you sure you want to void the payment?'; $_['text_confirm_capture'] = 'Are you sure you want to capture the payment?'; $_['text_confirm_refund'] = 'Are you sure you want to refund the payment?'; +$_['text_void'] = 'Void'; +$_['text_payment'] = 'Payment'; +$_['text_refund'] = "Refund"; // Entry $_['entry_certificate_path'] = 'Certificate path'; diff --git a/admin/extension/payment/g2apay.php b/admin/extension/payment/g2apay.php index a6d480e..acd8f3a 100644 --- a/admin/extension/payment/g2apay.php +++ b/admin/extension/payment/g2apay.php @@ -18,6 +18,7 @@ $_['text_column_type'] = 'Type'; $_['text_column_date_added'] = 'Added'; $_['text_refund_ok'] = 'Refund was successfully requested'; $_['text_refund_ok_order'] = 'Refund was successfully requested, amount fully refunded'; +$_['text_refund'] = 'Refund'; // Entry $_['entry_username'] = 'Username'; diff --git a/admin/extension/payment/globalpay.php b/admin/extension/payment/globalpay.php index 7732f84..2bef3a0 100644 --- a/admin/extension/payment/globalpay.php +++ b/admin/extension/payment/globalpay.php @@ -44,6 +44,9 @@ $_['text_confirm_void'] = 'Are you sure you want to void the payment?'; $_['text_confirm_capture'] = 'Are you sure you want to capture the payment?'; $_['text_confirm_rebate'] = 'Are you sure you want to rebate the payment?'; $_['text_globalpay'] = 'Globalpay'; +$_['text_void'] = 'Void'; +$_['text_payment'] = 'Payment'; +$_['text_rebate'] = 'Rebate'; // Entry $_['entry_merchant_id'] = 'Merchant ID'; diff --git a/admin/extension/payment/globalpay_remote.php b/admin/extension/payment/globalpay_remote.php index 4f12e90..60ace4f 100644 --- a/admin/extension/payment/globalpay_remote.php +++ b/admin/extension/payment/globalpay_remote.php @@ -39,6 +39,9 @@ $_['text_confirm_void'] = 'Are you sure you want to void the payment?'; $_['text_confirm_capture'] = 'Are you sure you want to capture the payment?'; $_['text_confirm_rebate'] = 'Are you sure you want to rebate the payment?'; $_['text_globalpay_remote'] = 'Globalpay'; +$_['text_void'] = 'Void'; +$_['text_payment'] = 'Payment'; +$_['text_rebate'] = 'Rebate'; // Column $_['text_column_amount'] = 'Amount'; diff --git a/admin/extension/payment/paypal.php b/admin/extension/payment/paypal.php new file mode 100644 index 0000000..0fb4226 --- /dev/null +++ b/admin/extension/payment/paypal.php @@ -0,0 +1,138 @@ +PayPal Commerce Platform'; +$_['text_extensions'] = 'Extensions'; +$_['text_edit'] = 'Edit PayPal'; +$_['text_general'] = 'General'; +$_['text_order_status'] = 'Order Status'; +$_['text_checkout_express'] = 'Checkout'; +$_['text_checkout_card'] = 'Advanced Card'; +$_['text_checkout_message'] = 'Pay Later Message'; +$_['text_production'] = 'Production'; +$_['text_sandbox'] = 'Sandbox'; +$_['text_authorization'] = 'Authorization'; +$_['text_sale'] = 'Sale'; +$_['text_connect'] = 'Your seller account has been connected.
Client ID = %s
Secret = %s
Merchant ID = %s
If you would like to connect another account, please, disconnect.'; +$_['text_currency_aud'] = 'Australian Dollar'; +$_['text_currency_brl'] = 'Brazilian Real'; +$_['text_currency_cad'] = 'Canadian Dollar'; +$_['text_currency_czk'] = 'Czech Krone'; +$_['text_currency_dkk'] = 'Danish Krone'; +$_['text_currency_eur'] = 'Euro'; +$_['text_currency_hkd'] = 'Hong Kong Dollar'; +$_['text_currency_huf'] = 'Hungarian Forint'; +$_['text_currency_inr'] = 'Indian Rupee'; +$_['text_currency_ils'] = 'Israeli New Shekel'; +$_['text_currency_jpy'] = 'Japanese Yen'; +$_['text_currency_myr'] = 'Malaysian Ringgit'; +$_['text_currency_mxn'] = 'Mexican Peso'; +$_['text_currency_twd'] = 'New Taiwan Dollar'; +$_['text_currency_nzd'] = 'New Zealand Dollar'; +$_['text_currency_nok'] = 'Norwegian Krone'; +$_['text_currency_php'] = 'Philippine peso'; +$_['text_currency_pln'] = 'Polish Zloty'; +$_['text_currency_gbp'] = 'Pound Sterling'; +$_['text_currency_rub'] = 'Russian Ruble'; +$_['text_currency_sgd'] = 'Singapore Dollar'; +$_['text_currency_sek'] = 'Swedish Krone'; +$_['text_currency_chf'] = 'Swiss Frank'; +$_['text_currency_thb'] = 'Thai Baht'; +$_['text_currency_usd'] = 'US Dollar'; +$_['text_completed_status'] = 'Completed Status'; +$_['text_denied_status'] = 'Denied Status'; +$_['text_failed_status'] = 'Failed Status'; +$_['text_pending_status'] = 'Pending Status'; +$_['text_refunded_status'] = 'Refunded Status'; +$_['text_reversed_status'] = 'Reversed Status'; +$_['text_voided_status'] = 'Voided Status'; +$_['text_align_left'] = 'Align Left'; +$_['text_align_center'] = 'Align Center'; +$_['text_align_right'] = 'Align Right'; +$_['text_small'] = 'Small'; +$_['text_medium'] = 'Medium'; +$_['text_large'] = 'Large'; +$_['text_responsive'] = 'Responsive'; +$_['text_gold'] = 'Gold'; +$_['text_blue'] = 'Blue'; +$_['text_silver'] = 'Silver'; +$_['text_white'] = 'White'; +$_['text_black'] = 'Black'; +$_['text_pill'] = 'Pill'; +$_['text_rect'] = 'Rect'; +$_['text_checkout'] = 'Checkout'; +$_['text_pay'] = 'Pay'; +$_['text_buy_now'] = 'Buy Now'; +$_['text_pay_pal'] = 'PayPal'; +$_['text_installment'] = 'Installment'; +$_['text_text'] = 'Text Message'; +$_['text_flex'] = 'Flexible Banner'; +$_['text_accept'] = 'Accept'; +$_['text_decline'] = 'Decline'; +$_['text_recommended'] = '(recommended)'; +$_['text_3ds_undefined'] = 'You have not required 3D Secure for the buyer or the card network did not require a 3D Secure.'; +$_['text_3ds_error'] = 'An error occurred with the 3DS authentication system.'; +$_['text_3ds_skipped_by_buyer'] = 'Buyer was presented the 3D Secure challenge but chose to skip the authentication.'; +$_['text_3ds_failure'] = 'Buyer may have failed the challenge or the device was not verified.'; +$_['text_3ds_bypassed'] = '3D Secure was skipped as authentication system did not require a challenge.'; +$_['text_3ds_attempted'] = 'Card is not enrolled in 3D Secure as card issuing bank is not participating in 3D Secure.'; +$_['text_3ds_unavailable'] = 'Issuing bank is not able to complete authentication.'; +$_['text_3ds_card_ineligible'] = 'Card is not eligible for 3DS Secure authentication.'; +$_['text_confirm'] = 'Are you sure?'; + +// Entry +$_['entry_connect'] = 'Connect'; +$_['entry_checkout_express_status'] = 'Checkout'; +$_['entry_checkout_card_status'] = 'Advanced Card'; +$_['entry_checkout_message_status'] = 'Pay Later Message'; +$_['entry_environment'] = 'Environment'; +$_['entry_debug'] = 'Debug Logging'; +$_['entry_transaction_method'] = 'Settlement Method'; +$_['entry_total'] = 'Total'; +$_['entry_geo_zone'] = 'Geo Zone'; +$_['entry_status'] = 'Status'; +$_['entry_sort_order'] = 'Sort Order'; +$_['entry_currency_code'] = 'Currency'; +$_['entry_currency_value'] = 'Currency Value'; +$_['entry_smart_button'] = 'Smart Button'; +$_['entry_button_align'] = 'Button Align'; +$_['entry_button_size'] = 'Button Size'; +$_['entry_button_color'] = 'Button Color'; +$_['entry_button_shape'] = 'Button Shape'; +$_['entry_button_label'] = 'Button Label'; +$_['entry_form_align'] = 'Form Align'; +$_['entry_form_size'] = 'Form Size'; +$_['entry_secure_status'] = '3D Secure Status'; +$_['entry_secure_scenario'] = '3D Secure Scenarios'; +$_['entry_message_align'] = 'Message Align'; +$_['entry_message_size'] = 'Message Size'; +$_['entry_message_layout'] = 'Message Layout'; +$_['entry_message_text_color'] = 'Message Text Color'; +$_['entry_message_text_size'] = 'Message Text Size'; +$_['entry_message_flex_color'] = 'Message Banner Color'; +$_['entry_message_flex_ratio'] = 'Message Banner Ratio'; + +// Help +$_['help_checkout_express'] = 'If your country is not available in the list when going through the PayPal onboarding experience please click here.'; +$_['help_checkout_express_status'] = 'When activated PayPal will display personalized Smart Buttons avalible to your customers based on their location.'; +$_['help_checkout_card_status'] = 'PayPal verifies if you are eligible for advanced card payment and will display this option on the checkout step if available.'; +$_['help_checkout_message_status'] = 'Add pay later messaging to your site.'; +$_['help_total'] = 'The checkout total the order must reach before this payment method becomes active.'; +$_['help_currency_code'] = 'Select the default currency for PayPal.'; +$_['help_currency_value'] = 'Set to 1.00000 if this is your default currency.'; +$_['help_secure_status'] = '3D Secure enables you to authenticate card holders through card issuers. It reduces the likelihood of fraud when you use supported cards and improves transaction perfomance. A successful 3D Secure authentication can shift liability for chargebacks due to fraud from you -the merchant- to the card issuer.'; +$_['help_secure_scenario'] = '3D Secure authentication is perfomed only if the card is enrolled for the service. In scenarios where the 3D Secure authentication has not been successful, you have the option to complete the payment at your own risk, meaning that you -the merchant- will be liable in case of a chargeback.'; + +// Button +$_['button_connect'] = 'Connect with PayPal'; +$_['button_disconnect'] = 'Disconnect'; +$_['button_smart_button'] = 'Smart Button Configure'; + +// Success +$_['success_save'] = 'Success: You have modified PayPal!'; + +// Error +$_['error_permission'] = 'Warning: You do not have permission to modify payment PayPal!'; +$_['error_timeout'] = 'Sorry, PayPal is currently busy. Please try again later!'; \ No newline at end of file diff --git a/admin/extension/payment/pp_express.php b/admin/extension/payment/pp_express.php index b6761f3..5e577bd 100644 --- a/admin/extension/payment/pp_express.php +++ b/admin/extension/payment/pp_express.php @@ -6,7 +6,7 @@ $_['heading_title'] = 'PayPal Express Checkout'; $_['text_extension'] = 'Extensions'; $_['text_success'] = 'Success: You have modified PayPal Express Checkout account details!'; $_['text_edit'] = 'Edit PayPal Express Checkout'; -$_['text_pp_express'] = 'PayPal Express Checkout'; +$_['text_pp_express'] = 'PayPal Website Payment Pro'; $_['text_authorization'] = 'Authorization'; $_['text_sale'] = 'Sale'; $_['text_signup'] = 'Sign up for PayPal - save your settings first as this page will be refreshed'; @@ -18,27 +18,16 @@ $_['text_show_quick_setup'] = 'Show Quick Setup'; $_['text_quick_setup'] = 'Quick setup - Link an existing or create a new PayPal account to start accepting payments in minutes'; $_['text_paypal_consent'] = 'By using the quick setup tool you allow PayPal to receive information about your store'; $_['text_success_connect'] = 'Success: You have connected your PayPal account!'; -$_['text_promotion_main'] = 'Give your buyers a simplified checkout experience on multiple devices that keeps them local to your website throughout the payment process'; +$_['text_preferred_main'] = 'Gives your buyers a simplified checkout experience on multiple devices that keeps them local to your website throughout the payment authorization process'; $_['text_learn_more'] = '(Learn more)'; -$_['text_promotion_li_1'] = 'Start accepting PayPal in three clicks'; -$_['text_promotion_li_2'] = 'Accept payments from around the world'; -$_['text_promotion_li_3'] = 'Offer Express Checkout Shortcut, let buyers checkout directly from your basket page'; +$_['text_preferred_li_1'] = 'Start accepting PayPal in three clicks'; +$_['text_preferred_li_2'] = 'Accept payments from around the world'; +$_['text_preferred_li_3'] = 'Offer Express Checkout Shortcut, letting buyers checkout directly from your basket page'; +$_['text_preferred_li_4'] = 'Improve conversion with PayPal One Touch and In-Context checkout'; $_['text_connect_paypal'] = 'Connect with PayPal'; +$_['text_incontext_not_supported'] = '* Not supported with In-Context Checkout'; $_['text_retrieve'] = 'Your details have been entered from PayPal'; $_['text_enable_button'] = 'We recommend offering PayPal Express Shortcut to maximise checkout conversion, this allows customers to use their PayPal address book and checkout is as little as three taps from the basket page. Click enable to install the extension and access the layout manager, you will ned to add "PayPal Express Checkout Button" to the checkout layout'; -$_['text_horizontal'] = 'Horizontal'; -$_['text_vertical'] = 'Vertical'; -$_['text_medium'] = 'Medium'; -$_['text_large'] = 'Large'; -$_['text_responsive'] = 'Responsive'; -$_['text_pill'] = 'Pill'; -$_['text_rectangle'] = 'Rectangle'; -$_['text_gold'] = 'Gold'; -$_['text_blue'] = 'Blue'; -$_['text_silver'] = 'Silver'; -$_['text_black'] = 'Black'; -$_['text_button_styling'] = 'Button Styling'; -$_['text_funding_type'] = 'Optional Funding Methods'; // Entry $_['entry_username'] = 'API Username'; @@ -67,14 +56,10 @@ $_['entry_processed_status'] = 'Processed Status'; $_['entry_refunded_status'] = 'Refunded Status'; $_['entry_reversed_status'] = 'Reversed Status'; $_['entry_voided_status'] = 'Voided Status'; +$_['entry_allow_notes'] = 'Allow Notes'; +$_['entry_colour'] = 'Page Background Colour'; $_['entry_logo'] = 'Logo'; -$_['entry_style_layout'] = 'Button Layout'; -$_['entry_style_size'] = 'Button Size'; -$_['entry_style_shape'] = 'Button Shape'; -$_['entry_style_color'] = 'Button Colour'; -$_['entry_pp_credit'] = 'PayPal Credit'; -$_['entry_pp_cards'] = 'Credit or Debit Cards'; -$_['entry_pp_elv'] = 'DE (German) bank payment'; +$_['entry_incontext'] = 'Disable In-Context Checkout'; // Tab $_['tab_api'] = 'API Details'; @@ -85,10 +70,8 @@ $_['tab_checkout'] = 'Checkout'; $_['help_ipn'] = 'Required for subscriptions'; $_['help_total'] = 'The checkout total the order must reach before this payment method becomes active'; $_['help_logo'] = 'Max 750px(w) x 90px(h)
You should only use a logo if you have SSL set up.'; +$_['help_colour'] = '6 character HTML colour code'; $_['help_currency'] = 'Used for transaction searches'; -$_['help_pp_credit'] = 'Non-US merchants need to apply to accept PayPal Credit, contact PayPal for more information. Enabled by default for all US buyers'; -$_['help_pp_cards'] = 'Enabled by default for all buyers'; -$_['help_pp_elv'] = 'Elektronisches Lastschriftverfahren (bank payments). Enabled by default for all DE buyers'; // Error $_['error_permission'] = 'Varoitus: You do not have permission to modify payment PayPal Express Checkout!'; diff --git a/admin/extension/payment/pp_payflow.php b/admin/extension/payment/pp_payflow.php index 84dd4c9..46f08c8 100644 --- a/admin/extension/payment/pp_payflow.php +++ b/admin/extension/payment/pp_payflow.php @@ -6,7 +6,7 @@ $_['heading_title'] = 'PayPal Payflow Pro'; $_['text_extension'] = 'Extensions'; $_['text_success'] = 'Success: You have modified PayPal Direct (UK) account details!'; $_['text_edit'] = 'Edit PayPal Payflow Pro'; -$_['text_pp_payflow'] = 'PayPal Payflow Pro'; +$_['text_pp_payflow'] = 'PayPal Website Payment Pro'; $_['text_authorization'] = 'Authorization'; $_['text_sale'] = 'Sale'; @@ -32,7 +32,7 @@ $_['help_test'] = 'Use the live or testing (sandbox) gateway server to proces $_['help_total'] = 'The checkout total the order must reach before this payment method becomes active'; // Error -$_['error_permission'] = 'Varoitus: You do not have permission to modify payment PayPal Payflow Pro!'; +$_['error_permission'] = 'Varoitus: You do not have permission to modify payment PayPal Website Payment Pro (UK)!'; $_['error_vendor'] = 'Vendor Required!'; $_['error_user'] = 'User Required!'; $_['error_password'] = 'Password Required!'; diff --git a/admin/extension/payment/pp_payflow_iframe.php b/admin/extension/payment/pp_payflow_iframe.php index 1eb7d23..ecfb229 100644 --- a/admin/extension/payment/pp_payflow_iframe.php +++ b/admin/extension/payment/pp_payflow_iframe.php @@ -7,7 +7,7 @@ $_['heading_refund'] = 'Refund'; $_['text_extension'] = 'Extensions'; $_['text_success'] = 'Success: You have modified PayPal Payflow Pro iFrame account details!'; $_['text_edit'] = 'Edit PayPal Payflow Pro iFrame'; -$_['text_pp_payflow_iframe'] = 'PayPal Payflow Pro iFrame'; +$_['text_pp_payflow_iframe'] = 'PayPal Website Payment Pro'; $_['text_authorization'] = 'Authorization'; $_['text_sale'] = 'Sale'; $_['text_authorise'] = 'Authorise'; @@ -93,7 +93,7 @@ $_['button_void'] = 'Void'; $_['button_capture'] = 'Capture'; // Error -$_['error_permission'] = 'Varoitus: You do not have permission to modify payment PayPal Payflow Pro iFrame!'; +$_['error_permission'] = 'Varoitus: You do not have permission to modify payment PayPal Website Payment Pro iFrame (UK)!'; $_['error_vendor'] = 'Vendor Required!'; $_['error_user'] = 'User Required!'; $_['error_password'] = 'Password Required!'; diff --git a/admin/extension/payment/pp_pro.php b/admin/extension/payment/pp_pro.php index 9001181..622be4d 100644 --- a/admin/extension/payment/pp_pro.php +++ b/admin/extension/payment/pp_pro.php @@ -6,7 +6,7 @@ $_['heading_title'] = 'PayPal Pro'; $_['text_extension'] = 'Extensions'; $_['text_success'] = 'Success: You have modified PayPal Website Payment Pro Checkout account details!'; $_['text_edit'] = 'Edit PayPal Pro'; -$_['text_pp_pro'] = 'PayPal Pro'; +$_['text_pp_pro'] = 'PayPal Website Payment Pro'; $_['text_authorization'] = 'Authorization'; $_['text_sale'] = 'Sale'; @@ -27,7 +27,7 @@ $_['help_test'] = 'Use the live or testing (sandbox) gateway server to proces $_['help_total'] = 'The checkout total the order must reach before this payment method becomes active'; // Error -$_['error_permission'] = 'Varoitus: You do not have permission to modify payment PayPal Pro!'; +$_['error_permission'] = 'Varoitus: You do not have permission to modify payment PayPal Website Payment Pro Checkout!'; $_['error_username'] = 'API Username Required!'; $_['error_password'] = 'API Password Required!'; $_['error_signature'] = 'API Signature Required!'; \ No newline at end of file diff --git a/admin/extension/payment/pp_pro_iframe.php b/admin/extension/payment/pp_pro_iframe.php index 55d2fe1..97b66c1 100644 --- a/admin/extension/payment/pp_pro_iframe.php +++ b/admin/extension/payment/pp_pro_iframe.php @@ -6,7 +6,7 @@ $_['heading_title'] = 'PayPal Pro iFrame'; $_['text_extension'] = 'Extensions'; $_['text_success'] = 'Success: You have modified PayPal Pro iFrame account details!'; $_['text_edit'] = 'Edit PayPal Pro iFrame'; -$_['text_pp_pro_iframe'] = 'PayPal Pro iFrame'; +$_['text_pp_pro_iframe'] = 'PayPal Website Payment Pro'; $_['text_authorization'] = 'Authorization'; $_['text_sale'] = 'Sale'; $_['text_payment_info'] = 'Payment information'; @@ -163,7 +163,7 @@ $_['button_capture'] = 'Capture'; $_['button_reauthorise'] = 'Reauthorise'; // Error -$_['error_permission'] = 'Varoitus: You do not have permission to modify payment PayPal Pro iFrame!'; +$_['error_permission'] = 'Varoitus: You do not have permission to modify payment PayPal Website Payment Pro iFrame (UK)!'; $_['error_sig'] = 'Signature Required!'; $_['error_user'] = 'User Required!'; $_['error_password'] = 'Password Required!'; diff --git a/admin/extension/payment/pp_standard.php b/admin/extension/payment/pp_standard.php index f4651e9..e8c8ca3 100644 --- a/admin/extension/payment/pp_standard.php +++ b/admin/extension/payment/pp_standard.php @@ -6,7 +6,7 @@ $_['heading_title'] = 'PayPal Payments Standard'; $_['text_extension'] = 'Extensions'; $_['text_success'] = 'Success: You have modified PayPal account details!'; $_['text_edit'] = 'Edit PayPal Payments Standard'; -$_['text_pp_standard'] = 'PayPal Payments Standard'; +$_['text_pp_standard'] = 'PayPal Website Payment Pro'; $_['text_authorization'] = 'Authorization'; $_['text_sale'] = 'Sale'; @@ -40,5 +40,5 @@ $_['help_debug'] = 'Logs additional information to the system log'; $_['help_total'] = 'The checkout total the order must reach before this payment method becomes active'; // Error -$_['error_permission'] = 'Varoitus: You do not have permission to modify payment PayPal Payments Standard!'; +$_['error_permission'] = 'Varoitus: You do not have permission to modify payment PayPal!'; $_['error_email'] = 'E-Mail required!'; \ No newline at end of file diff --git a/admin/extension/payment/realex.php b/admin/extension/payment/realex.php index 2033ad4..0ab30e2 100644 --- a/admin/extension/payment/realex.php +++ b/admin/extension/payment/realex.php @@ -44,6 +44,9 @@ $_['text_confirm_void'] = 'Are you sure you want to void the payment?'; $_['text_confirm_capture'] = 'Are you sure you want to capture the payment?'; $_['text_confirm_rebate'] = 'Are you sure you want to rebate the payment?'; $_['text_realex'] = 'Realex'; +$_['text_void'] = 'Void'; +$_['text_payment'] = "Payment"; +$_['text_rebate'] = 'Rebate'; // Entry $_['entry_merchant_id'] = 'Merchant ID'; diff --git a/admin/extension/payment/realex_remote.php b/admin/extension/payment/realex_remote.php index 177428b..ab1ef0f 100644 --- a/admin/extension/payment/realex_remote.php +++ b/admin/extension/payment/realex_remote.php @@ -39,6 +39,9 @@ $_['text_confirm_void'] = 'Are you sure you want to void the payment?'; $_['text_confirm_capture'] = 'Are you sure you want to capture the payment?'; $_['text_confirm_rebate'] = 'Are you sure you want to rebate the payment?'; $_['text_realex_remote'] = 'Realex'; +$_['text_void'] = 'Void'; +$_['text_payment'] = "Payment"; +$_['text_rebate'] = 'Rebate'; // Column $_['text_column_amount'] = 'Amount'; diff --git a/admin/extension/payment/sagepay_direct.php b/admin/extension/payment/sagepay_direct.php index d91357c..6d09762 100644 --- a/admin/extension/payment/sagepay_direct.php +++ b/admin/extension/payment/sagepay_direct.php @@ -54,6 +54,9 @@ $_['help_debug'] = 'Enabling debug will write sensitive data to a log file. $_['help_transaction'] = 'Transaction method MUST be set to Payment to allow subscription payments'; $_['help_cron_job_token'] = 'Make this long and hard to guess'; $_['help_cron_job_url'] = 'Set a cron job to call this URL'; +$_['text_void'] = 'Void'; +$_['text_payment'] = "Payment"; +$_['text_rebate'] = 'Rebate'; // Button $_['button_release'] = 'Release'; diff --git a/admin/extension/payment/sagepay_server.php b/admin/extension/payment/sagepay_server.php index 630bde6..e7faeb1 100644 --- a/admin/extension/payment/sagepay_server.php +++ b/admin/extension/payment/sagepay_server.php @@ -32,6 +32,9 @@ $_['text_column_date_added'] = 'Created'; $_['text_confirm_void'] = 'Are you sure you want to void the payment?'; $_['text_confirm_release'] = 'Are you sure you want to release the payment?'; $_['text_confirm_rebate'] = 'Are you sure you want to rebate the payment?'; +$_['text_void'] = 'Void'; +$_['text_payment'] = "Payment"; +$_['text_rebate'] = 'Rebate'; // Entry $_['entry_vendor'] = 'Vendor'; diff --git a/admin/extension/payment/securetrading_pp.php b/admin/extension/payment/securetrading_pp.php index 08c932d..9287961 100644 --- a/admin/extension/payment/securetrading_pp.php +++ b/admin/extension/payment/securetrading_pp.php @@ -13,8 +13,12 @@ $_['text_refund_issued'] = 'Refund was successfully issu $_['text_pending_settlement_manually_overriden'] = 'Pending Settlement, manually overriden'; $_['text_pending_suspended'] = 'Suspended'; $_['text_pending_settled'] = 'Settled'; +$_['text_reversed'] = 'Reversed'; +$_['text_payment'] = "Payment"; +$_['text_rebate'] = 'Rebate'; $_['entry_site_reference'] = 'Site reference'; +$_['entry_version'] = 'Version'; $_['entry_username'] = 'Username'; $_['entry_password'] = 'Password'; $_['entry_site_security_status'] = 'Use Site Security hash'; @@ -39,6 +43,7 @@ $_['entry_refund'] = 'Issue refund (%s):'; $_['error_permission'] = 'You do not have permissions to modify this module'; $_['error_site_reference'] = 'Site Reference is required'; +$_['error_version'] = 'Version is required'; $_['error_notification_password'] = 'Notification password is required'; $_['error_cards_accepted'] = 'Accepted cards is required'; $_['error_username'] = 'Username is required'; @@ -46,6 +51,7 @@ $_['error_password'] = 'Password is required'; $_['error_connection'] = 'Could not connect to Secure Trading'; $_['error_data_missing'] = 'Data missing'; +$_['help_version'] = 'Payment Version (e.g. 2)'; $_['help_username'] = 'Your webservice username'; $_['help_password'] = 'Your webservice password'; $_['help_refund'] = 'Please include the decimal point and the decimal part of the amount'; diff --git a/admin/extension/payment/securetrading_ws.php b/admin/extension/payment/securetrading_ws.php index 5176c10..79f23b1 100644 --- a/admin/extension/payment/securetrading_ws.php +++ b/admin/extension/payment/securetrading_ws.php @@ -44,6 +44,9 @@ $_['text_void_ok'] = 'Void was successful, order s $_['text_confirm_void'] = 'Are you sure you want to reverse the authorisation?'; $_['text_confirm_release'] = 'Are you sure you want to release the payment?'; $_['text_confirm_rebate'] = 'Are you sure you want to rebate the payment?'; +$_['text_reversed'] = 'Reversed'; +$_['text_payment'] = "Payment"; +$_['text_rebate'] = 'Rebate'; $_['entry_site_reference'] = 'Site reference'; $_['entry_username'] = 'Username'; diff --git a/admin/extension/payment/worldpay.php b/admin/extension/payment/worldpay.php index a8b5892..b9cde85 100644 --- a/admin/extension/payment/worldpay.php +++ b/admin/extension/payment/worldpay.php @@ -14,6 +14,8 @@ $_['text_release_ok_order'] = 'Release was successful, order status up $_['text_refund_ok'] = 'Rebate was successful'; $_['text_refund_ok_order'] = 'Rebate was successful, order status updated to refund'; $_['text_void_ok'] = 'Void was successful, order status updated to voided'; +$_['text_refund'] = 'Refund'; +$_['text_edit'] = 'Edit Worldpay Online Payments'; // Entry $_['entry_service_key'] = 'Service Key'; diff --git a/admin/extension/report/marketing.php b/admin/extension/report/marketing.php index d1a6203..8813f6d 100644 --- a/admin/extension/report/marketing.php +++ b/admin/extension/report/marketing.php @@ -19,7 +19,6 @@ $_['column_total'] = 'Total'; // Entry $_['entry_date_start'] = 'Date Start'; $_['entry_date_end'] = 'Date End'; -$_['entry_status'] = 'Order Status'; $_['entry_status'] = 'Tila'; $_['entry_sort_order'] = 'Lajittelujärjestys'; diff --git a/admin/extension/report/sale_order.php b/admin/extension/report/sale_order.php index fc323b7..2198f84 100644 --- a/admin/extension/report/sale_order.php +++ b/admin/extension/report/sale_order.php @@ -25,9 +25,8 @@ $_['column_total'] = 'Total'; $_['entry_date_start'] = 'Date Start'; $_['entry_date_end'] = 'Date End'; $_['entry_group'] = 'Group By'; -$_['entry_status'] = 'Order Status'; $_['entry_status'] = 'Tila'; -$_['entry_sort_order'] = 'Lajittelujärjestys'; +$_['entry_sort_order'] = 'Sort Order'; // Error $_['error_permission'] = 'Varoitus: You do not have permission to modify sales report!'; diff --git a/admin/extension/report/sale_return.php b/admin/extension/report/sale_return.php index b47a8c3..3598655 100644 --- a/admin/extension/report/sale_return.php +++ b/admin/extension/report/sale_return.php @@ -22,7 +22,6 @@ $_['column_returns'] = 'No. Returns'; $_['entry_date_start'] = 'Date Start'; $_['entry_date_end'] = 'Date End'; $_['entry_group'] = 'Group By'; -$_['entry_status'] = 'Return Status'; $_['entry_status'] = 'Tila'; $_['entry_sort_order'] = 'Lajittelujärjestys'; diff --git a/admin/extension/report/sale_shipping.php b/admin/extension/report/sale_shipping.php index f80fba4..a5e365a 100644 --- a/admin/extension/report/sale_shipping.php +++ b/admin/extension/report/sale_shipping.php @@ -24,7 +24,6 @@ $_['column_total'] = 'Total'; $_['entry_date_start'] = 'Date Start'; $_['entry_date_end'] = 'Date End'; $_['entry_group'] = 'Group By'; -$_['entry_status'] = 'Order Status'; $_['entry_status'] = 'Tila'; $_['entry_sort_order'] = 'Lajittelujärjestys'; diff --git a/admin/extension/report/sale_tax.php b/admin/extension/report/sale_tax.php index 53e7c9e..ba63409 100644 --- a/admin/extension/report/sale_tax.php +++ b/admin/extension/report/sale_tax.php @@ -24,7 +24,6 @@ $_['column_total'] = 'Total'; $_['entry_date_start'] = 'Date Start'; $_['entry_date_end'] = 'Date End'; $_['entry_group'] = 'Group By'; -$_['entry_status'] = 'Order Status'; $_['entry_status'] = 'Tila'; $_['entry_sort_order'] = 'Lajittelujärjestys'; diff --git a/admin/mail/voucher.php b/admin/mail/voucher.php index 726a91a..c3916fd 100644 --- a/admin/mail/voucher.php +++ b/admin/mail/voucher.php @@ -7,3 +7,4 @@ $_['text_from'] = 'This Gift Certificate has been sent to you by %s'; $_['text_message'] = 'With a message saying'; $_['text_redeem'] = 'To redeem this Gift Certificate, write down the redemption code which is %s then click on the the link below and purchase the product you wish to use this gift certificate on. You can enter the gift certificate code on the shopping cart page before you click checkout.'; $_['text_footer'] = 'Please reply to this email if you have any questions.'; +$_['text_sent'] = 'Success: Gift Voucher e-mail has been sent!'; diff --git a/admin/marketing/contact.php b/admin/marketing/contact.php index 70cfce4..66b1afa 100644 --- a/admin/marketing/contact.php +++ b/admin/marketing/contact.php @@ -4,7 +4,7 @@ $_['heading_title'] = 'Sähköposti'; // Text $_['text_success'] = 'Your message has been successfully sent!'; -$_['text_sent'] = 'Your message has been successfully sent to %s of %s recipients!'; +$_['text_sent'] = 'Your message has been successfully sent to %s - %s recipients!'; $_['text_list'] = 'Mail List'; $_['text_default'] = 'Default'; $_['text_newsletter'] = 'All Newsletter Subscribers'; @@ -34,3 +34,4 @@ $_['help_product'] = 'Send only to customers who have ordered products i $_['error_permission'] = 'Varoitus: You do not have permission to send E-Mails!'; $_['error_subject'] = 'E-Mail Subject required!'; $_['error_message'] = 'E-Mail Message required!'; +$_['error_email'] = 'E-Mail required!'; diff --git a/admin/marketplace/marketplace.php b/admin/marketplace/marketplace.php index 132aa62..07d19b0 100644 --- a/admin/marketplace/marketplace.php +++ b/admin/marketplace/marketplace.php @@ -46,6 +46,7 @@ $_['text_name'] = 'Download Name'; $_['text_progress'] = 'Progress'; $_['text_available'] = 'Available Installs'; $_['text_action'] = 'Toiminto'; +$_['text_see_more'] = 'see more replies...'; // Entry $_['entry_pin'] = 'PIN'; @@ -63,6 +64,7 @@ $_['button_view_all'] = 'View all extensions'; $_['button_get_support'] = 'Get Support'; $_['button_comment'] = 'Kommentti'; $_['button_reply'] = 'Reply'; +$_['button_refresh'] = 'Refresh'; // Error $_['error_permission'] = 'Varoitus: You do not have permission to modify extensions!'; diff --git a/admin/sale/voucher.php b/admin/sale/voucher.php index 926c807..a21765b 100644 --- a/admin/sale/voucher.php +++ b/admin/sale/voucher.php @@ -7,7 +7,6 @@ $_['text_success'] = 'Success: You have modified vouchers!'; $_['text_list'] = 'Gift Voucher List'; $_['text_add'] = 'Add Gift Voucher'; $_['text_edit'] = 'Edit Gift Voucher'; -$_['text_sent'] = 'Success: Gift Voucher e-mail has been sent!'; // Column $_['column_name'] = 'Voucher Name'; diff --git a/admin/setting/setting.php b/admin/setting/setting.php index 14a2b4f..d3fd0cb 100644 --- a/admin/setting/setting.php +++ b/admin/setting/setting.php @@ -52,6 +52,7 @@ $_['entry_comment'] = 'Comment'; $_['entry_location'] = 'Store Location'; $_['entry_country'] = 'Country'; $_['entry_zone'] = 'Region / State'; +$_['entry_timezone'] = 'Time Zone'; $_['entry_language'] = 'Language'; $_['entry_admin_language'] = 'Administration Language'; $_['entry_currency'] = 'Currency'; @@ -143,7 +144,7 @@ $_['help_customer_activity'] = 'Track customers activity via the custome $_['help_customer_group'] = 'Default customer group.'; $_['help_customer_group_display'] = 'Display customer groups that new customers can select to use such as wholesale and business when signing up.'; $_['help_customer_price'] = 'Only show prices when a customer is logged in.'; -$_['help_login_attempts'] = 'Maximum login attempts allowed before the account is locked for 1 hour. Customer and affliate accounts can be unlocked on the customer or affliate admin pages.'; +$_['help_login_attempts'] = 'Maximum login attempts allowed before the account is locked for 1 hour. Customer and affliate accounts can be unlocked on the customer or affliate admin pages. Admin account can be unlocked on reset password.'; $_['help_account'] = 'Forces people to agree to terms before an account can be created.'; $_['help_invoice_prefix'] = 'Set the invoice prefix (e.g. INV-2011-00). Invoice IDs will start at 1 for each unique prefix.'; $_['help_cart_weight'] = 'Show the cart weight on the cart page.'; diff --git a/admin/tool/upload.php b/admin/tool/upload.php index d9b917d..6d2dd75 100644 --- a/admin/tool/upload.php +++ b/admin/tool/upload.php @@ -19,3 +19,5 @@ $_['entry_date_added'] = 'Lisäyspäivä'; // Error $_['error_permission'] = 'Varoitus: You do not have permission to modify uploads!'; +$_['error_upload'] = 'Invalid upload!'; +$_['error_file'] = 'Upload file is not found!'; diff --git a/admin/user/api.php b/admin/user/api.php index c0c6c9c..7b8590f 100644 --- a/admin/user/api.php +++ b/admin/user/api.php @@ -29,4 +29,4 @@ $_['entry_ip'] = 'IP-osoite'; $_['error_permission'] = 'Varoitus: You do not have permission to modified APIs!'; $_['error_username'] = 'API USername must be between 3 and 20 characters!'; $_['error_key'] = 'API Key must be between 64 and 256 characters!'; -$_['error_ip'] = 'You must have atleast one IP added to the allowed list!'; +$_['error_ip'] = 'You must have at least one IP added to the allowed list!'; diff --git a/catalog/account/address.php b/catalog/account/address.php index 93bcce0..9d9a4ab 100644 --- a/catalog/account/address.php +++ b/catalog/account/address.php @@ -11,6 +11,7 @@ $_['text_add'] = 'Your address has been successfully added'; $_['text_edit'] = 'Your address has been successfully updated'; $_['text_delete'] = 'Your address has been successfully deleted'; $_['text_empty'] = 'You have no addresses in your account.'; +$_['text_confirm'] = 'Are you sure?'; // Entry $_['entry_firstname'] = 'Etunimi'; diff --git a/catalog/checkout/cart.php b/catalog/checkout/cart.php index d6b52e2..7e5de59 100644 --- a/catalog/checkout/cart.php +++ b/catalog/checkout/cart.php @@ -18,7 +18,6 @@ $_['text_month'] = 'kuukausi'; $_['text_year'] = 'vuosi'; $_['text_trial'] = '%s every %s %s for %s payments then '; $_['text_recurring'] = '%s every %s %s'; -$_['text_payment_cancel'] = 'until cancelled'; $_['text_recurring_item'] = 'Recurring Item'; $_['text_payment_recurring'] = 'Payment Profile'; $_['text_trial_description'] = '%s every %d %s(s) for %d payment(s) then'; diff --git a/catalog/extension/module/divido_calculator.php b/catalog/extension/module/divido_calculator.php index a6c2f91..9912472 100644 --- a/catalog/extension/module/divido_calculator.php +++ b/catalog/extension/module/divido_calculator.php @@ -11,4 +11,5 @@ $_['text_credit_amount'] = 'Cost of credit'; $_['text_amount_payable'] = 'Total payable'; $_['text_total_interest'] = 'Total interest APR'; $_['text_monthly_installment'] = 'Monthly installment'; -$_['text_redirection'] = 'You will be redirected to Divido to complete this finance application when you confirm your order'; \ No newline at end of file +$_['text_redirection'] = 'You will be redirected to Divido to complete this finance application when you confirm your order'; +$_['text_divido'] = 'Divido'; \ No newline at end of file diff --git a/catalog/extension/module/paypal_smart_button.php b/catalog/extension/module/paypal_smart_button.php new file mode 100644 index 0000000..1359945 --- /dev/null +++ b/catalog/extension/module/paypal_smart_button.php @@ -0,0 +1,74 @@ + \ No newline at end of file diff --git a/catalog/extension/payment/amazon_login_pay.php b/catalog/extension/payment/amazon_login_pay.php index a252c7f..83a038a 100644 --- a/catalog/extension/payment/amazon_login_pay.php +++ b/catalog/extension/payment/amazon_login_pay.php @@ -39,3 +39,8 @@ $_['text_must_apply_coupon'] = 'Please apply your coupon.'; $_['text_payment_success'] = 'Your order was successfully placed. Order details are below'; $_['text_success_title'] = 'Your order has been placed!'; $_['text_tax_other'] = 'Taxes / Other handling fees'; +$_['error_failure_mfa'] = 'There was a problem with your payment. Your order hasn\'t been placed, and you haven\'t been charged.'; +$_['error_unexpected_network_error'] = 'Unexpected network error'; +$_['error_invaild_request'] = 'Invaild request, please post your order again'; +$_['error_abandoned_mfa'] = 'Something\'s wrong with your payment method. To place your order, try another.'; +$_['text_created_by'] = 'created by iSenseLabs, OpenCart, V%s'; diff --git a/catalog/extension/payment/divido.php b/catalog/extension/payment/divido.php index c852f86..578e906 100644 --- a/catalog/extension/payment/divido.php +++ b/catalog/extension/payment/divido.php @@ -15,3 +15,4 @@ $_['divido_checkout'] = 'Confirm and checkout with Divido'; $_['deposit_to_low'] = 'Deposit to low'; $_['credit_amount_to_low'] = 'Credit amount to low'; $_['no_country'] = 'Country not accepted'; +$_['text_divido'] = 'Divido'; diff --git a/catalog/extension/payment/eway.php b/catalog/extension/payment/eway.php index 6cb6f65..6dfdb9b 100644 --- a/catalog/extension/payment/eway.php +++ b/catalog/extension/payment/eway.php @@ -232,4 +232,12 @@ $_['text_card_message_F9031'] = 'Multiple transactions for same credit c $_['text_card_message_F9032'] = 'Invalid Customer Last Name'; $_['text_card_message_F9033'] = 'Invalid Billing Street'; $_['text_card_message_F9034'] = 'Invalid Shipping Street'; -$_['text_card_message_F9037'] = 'Suspicious Customer Email Address'; \ No newline at end of file +$_['text_card_message_F9037'] = 'Suspicious Customer Email Address'; + +// Error +$_['error_payment'] = 'Payment Error'; +$_['error_empty_name'] = 'Card Holder\'s Name must be entered'; +$_['error_invalid_card'] = 'Card Number appears invalid'; +$_['error_expiry_date'] = 'This expiry date has passed'; +$_['error_cvv'] = 'CVV/CSV Number appears invalid'; +$_['error_payment_text'] = 'There was a problem completing the payment'; \ No newline at end of file diff --git a/catalog/extension/payment/firstdata_remote.php b/catalog/extension/payment/firstdata_remote.php index 7fbc19a..bcaad23 100644 --- a/catalog/extension/payment/firstdata_remote.php +++ b/catalog/extension/payment/firstdata_remote.php @@ -3,6 +3,7 @@ $_['text_title'] = 'Credit or Debit Card'; $_['text_credit_card'] = 'Credit Card Details'; $_['text_wait'] = 'Please wait!'; +$_['text_store_card'] = 'Store card details?'; // Entry $_['entry_cc_number'] = 'Card number'; diff --git a/catalog/extension/payment/klarna_account.php b/catalog/extension/payment/klarna_account.php index c5d0089..a283b03 100644 --- a/catalog/extension/payment/klarna_account.php +++ b/catalog/extension/payment/klarna_account.php @@ -13,6 +13,8 @@ $_['text_payment_option'] = 'Payment options'; $_['text_single_payment'] = 'Single Payment'; $_['text_monthly_payment'] = '%s - %s per month'; $_['text_comment'] = 'Klarna\'s Invoice ID: %s' . "\n" . '%s/%s: %.4f'; +$_['text_terms_description'] = 'Mit der Übermittlung der für die Abwicklung des Rechnungskaufes und einer Identitäts - und Bonitätsprüfung erforderlichen +Daten an Klarna bin ich einverstanden. Meine Einwilligung kann ich jederzeit mit Wirkung für die Zukunft widerrufen.'; // Entry $_['entry_gender'] = 'Gender'; diff --git a/catalog/extension/payment/klarna_checkout.php b/catalog/extension/payment/klarna_checkout.php index 855fd59..b3a8cc4 100644 --- a/catalog/extension/payment/klarna_checkout.php +++ b/catalog/extension/payment/klarna_checkout.php @@ -10,4 +10,5 @@ $_['text_checkout'] = 'Checkout'; $_['text_success'] = 'Success'; $_['text_choose_shipping_method'] = 'Choose shipping method'; $_['text_sales_tax'] = 'Sales Tax'; -$_['text_newsletter'] = 'Subscribe to our newsletter'; \ No newline at end of file +$_['text_newsletter'] = 'Subscribe to our newsletter'; +$_['text_list'] = 'Order Summary'; \ No newline at end of file diff --git a/catalog/extension/payment/klarna_invoice.php b/catalog/extension/payment/klarna_invoice.php index ff42e10..d5f164a 100644 --- a/catalog/extension/payment/klarna_invoice.php +++ b/catalog/extension/payment/klarna_invoice.php @@ -10,6 +10,8 @@ $_['text_year'] = 'Year'; $_['text_month'] = 'Month'; $_['text_day'] = 'Day'; $_['text_comment'] = 'Klarna\'s Invoice ID: %s. ' . "\n" . '%s/%s: %.4f'; +$_['text_trems_description'] = 'Mit der Übermittlung der für die Abwicklung des Rechnungskaufes und einer Identitäts - und Bonitätsprüfung erforderlichen +Daten an Klarna bin ich einverstanden. Meine Einwilligung kann ich jederzeit mit Wirkung für die Zukunft widerrufen.'; // Entry $_['entry_gender'] = 'Gender'; diff --git a/catalog/extension/payment/paypal.php b/catalog/extension/payment/paypal.php new file mode 100644 index 0000000..e16320d --- /dev/null +++ b/catalog/extension/payment/paypal.php @@ -0,0 +1,28 @@ +contact us.'; +$_['error_timeout'] = 'Sorry, PayPal is currently busy. Please try again later!'; \ No newline at end of file diff --git a/catalog/information/contact.php b/catalog/information/contact.php index ca93e35..5d9a6ec 100644 --- a/catalog/information/contact.php +++ b/catalog/information/contact.php @@ -11,7 +11,7 @@ $_['text_telephone'] = 'Telephone'; $_['text_fax'] = 'Fax'; $_['text_open'] = 'Opening Times'; $_['text_comment'] = 'Comments'; -$_['text_success'] = '

Your enquiry has been successfully sent to the store owner!

'; +$_['text_message'] = '

Your enquiry has been successfully sent to the store owner!

'; // Entry $_['entry_name'] = 'Your Name'; diff --git a/catalog/product/product.php b/catalog/product/product.php index 0d47543..13c3473 100644 --- a/catalog/product/product.php +++ b/catalog/product/product.php @@ -48,3 +48,4 @@ $_['tab_review'] = 'Reviews (%s)'; $_['error_name'] = 'Varoitus: Review Name must be between 3 and 25 characters!'; $_['error_text'] = 'Varoitus: Review Text must be between 25 and 1000 characters!'; $_['error_rating'] = 'Varoitus: Please select a review rating!'; +$_['error_product'] = "Varoitus: Product required to add the review!"; diff --git a/install/en-gb.php b/install/en-gb.php new file mode 100644 index 0000000..273a0ad --- /dev/null +++ b/install/en-gb.php @@ -0,0 +1,7 @@ +More information'; -$_['text_amazon_pay'] = 'Amazon Pay is a trusted payment solution which allows customers to check in and out using information already stored in their Amazon account. It\'s fast, simple and secure....More information'; $_['text_facebook'] = 'Like us on Facebook'; $_['text_facebook_description'] = 'Tell us how much you like OpenCart!'; $_['text_facebook_visit'] = 'Visit our Facebook page';