From 3bcddd6b781f07ba7c267fd82d4a8424f7f7d953 Mon Sep 17 00:00:00 2001 From: Steve Ireland Date: Tue, 25 Apr 2023 22:45:43 -0400 Subject: [PATCH] For #3741. Manual migration of commits from master to branch through April 3, 2023 - through commit 89d7fcc. --- app/Language/ar-EG/Expenses.php | 2 +- app/Language/en-GB/Expenses.php | 2 +- app/Language/en-GB/Giftcards.php | 36 ++++++++++++------------- app/Language/en-GB/Reports.php | 12 ++++----- app/Language/en-US/Config.php | 4 +-- app/Language/en-US/Customers.php | 4 +-- app/Language/en-US/Sales.php | 4 +-- app/Language/en-US/Taxes.php | 16 +++++------ app/Language/fr/Expenses_categories.php | 2 +- app/Views/configs/system_info.php | 1 + 10 files changed, 42 insertions(+), 41 deletions(-) diff --git a/app/Language/ar-EG/Expenses.php b/app/Language/ar-EG/Expenses.php index b09f6e3d5..c504dcaf0 100644 --- a/app/Language/ar-EG/Expenses.php +++ b/app/Language/ar-EG/Expenses.php @@ -8,7 +8,7 @@ return [ "expenses_cannot_be_deleted" => "لا يمكن المسح", "expenses_cash" => "نقدا", "expenses_cash_filter" => "نقدا", - "expenses_categories_name" => "اسماء الفئات", + "expenses_categories_name" => "اسم الفئة", "expenses_category_required" => "خانة مطلوبة: الفئات", "expenses_check" => "شيك", "expenses_check_filter" => "تصفية", diff --git a/app/Language/en-GB/Expenses.php b/app/Language/en-GB/Expenses.php index a972cd64f..dbfa5e08a 100644 --- a/app/Language/en-GB/Expenses.php +++ b/app/Language/en-GB/Expenses.php @@ -43,7 +43,7 @@ return [ "expenses_successful_deleted" => "Expense delete successful", "expenses_successful_updating" => "Expense update successful", "expenses_supplier_name" => "Supplier", - "expenses_supplier_tax_code" => "VAT No.", + "expenses_supplier_tax_code" => "VAT No", "expenses_tax_amount" => "Tax", "expenses_tax_amount_number" => "", "expenses_update" => "Update Expense", diff --git a/app/Language/en-GB/Giftcards.php b/app/Language/en-GB/Giftcards.php index bc598afdb..8a0e14710 100644 --- a/app/Language/en-GB/Giftcards.php +++ b/app/Language/en-GB/Giftcards.php @@ -3,13 +3,13 @@ return [ "giftcards_add_minus" => "Inventory to add or subtract", "giftcards_allow_alt_description" => "Allow Alternate Description", "giftcards_bulk_edit" => "Bulk Edit", - "giftcards_cannot_be_deleted" => "Could not delete selected Gift Card(s), one or more of the selected Gift Card(s) has sales", - "giftcards_cannot_find_giftcard" => "Gift Card not found", - "giftcards_cannot_use" => "Gift Card %1 cannot be used for this sale. invalid Customer!", + "giftcards_cannot_be_deleted" => "Could not delete selected Gift Card(s), one or more of the selected Gift Card(s) has sales.", + "giftcards_cannot_find_giftcard" => "Gift Card not found.", + "giftcards_cannot_use" => "Gift Card %1 cannot be used for this sale. Invalid Customer.", "giftcards_card_value" => "Value", "giftcards_category" => "Category", - "giftcards_change_all_to_allow_alt_desc" => "Allow alternate description for all", - "giftcards_change_all_to_not_allow_allow_desc" => "Do not allow alternate description for all", + "giftcards_change_all_to_allow_alt_desc" => "Allow alternate description for all.", + "giftcards_change_all_to_not_allow_allow_desc" => "Do not allow alternate description for all.", "giftcards_change_all_to_serialized" => "Change All To Serialised", "giftcards_change_all_to_unserialized" => "Change All To Unserialised", "giftcards_confirm_bulk_edit" => "Are you sure you want to edit all the selected Gift Card(s)?", @@ -17,15 +17,15 @@ return [ "giftcards_confirm_restore" => "Are you sure you want to restore the selected Gift Card(s)?", "giftcards_cost_price" => "Cost Price", "giftcards_count" => "Update Inventory", - "giftcards_csv_import_failed" => "CSV import failed", + "giftcards_csv_import_failed" => "CSV import failed.", "giftcards_current_quantity" => "Current Quantity", "giftcards_description" => "Description", "giftcards_details_count" => "Inventory count details", "giftcards_do_nothing" => "Do nothing", - "giftcards_edit_fields_you_want_to_update" => "Edit desired fields for selected Gift Card(s)", - "giftcards_edit_multiple_giftcards" => "Edit multiple Gift Cards", - "giftcards_error_adding_updating" => "Gift Card add or update failed", - "giftcards_error_updating_multiple" => "Gift Card(s) update failed", + "giftcards_edit_fields_you_want_to_update" => "Edit desired fields for selected Gift Card(s).", + "giftcards_edit_multiple_giftcards" => "Edit multiple Gift Cards.", + "giftcards_error_adding_updating" => "Gift Card add or update failed.", + "giftcards_error_updating_multiple" => "Gift Card(s) update failed.", "giftcards_generate_barcodes" => "Generate Barcodes", "giftcards_giftcard" => "Gift Card", "giftcards_giftcard_number" => "Gift Card Number", @@ -34,19 +34,19 @@ return [ "giftcards_is_serialized" => "Gift Card has Serial Number", "giftcards_low_inventory_giftcards" => "Low Inventory Gift Cards", "giftcards_manually_editing_of_quantity" => "Manual Edit of Quantity", - "giftcards_must_select_giftcard_for_barcode" => "You must select at least one Gift Card to generate barcodes", + "giftcards_must_select_giftcard_for_barcode" => "You must select at least one Gift Card to generate barcodes.", "giftcards_new" => "New Gift Card", "giftcards_no_description_giftcards" => "No Description Gift Cards", - "giftcards_no_giftcards_to_display" => "No Giftcards to display", + "giftcards_no_giftcards_to_display" => "No Giftcards to display.", "giftcards_none" => "None", - "giftcards_none_selected" => "No Gift Card(s) selected to edit", - "giftcards_number" => "Gift Card Number must be a number", + "giftcards_none_selected" => "No Gift Card(s) selected to edit.", + "giftcards_number" => "Gift Card Number must be a number.", "giftcards_number_information" => "Gift Card Number", - "giftcards_number_required" => "Gift Card Number is a required field", + "giftcards_number_required" => "Gift Card Number is a required field.", "giftcards_one_or_multiple" => "Gift Card(s)", "giftcards_person_id" => "Customer", "giftcards_quantity" => "Quantity", - "giftcards_quantity_required" => "Quantity is a required field. Please close (X) to cancel", + "giftcards_quantity_required" => "Quantity is a required field. Please close (X) to cancel.", "giftcards_remaining_balance" => "Gift Card %1 remaining value is %2!", "giftcards_reorder_level" => "Reorder Level", "giftcards_retrive_giftcard_info" => "Retrieve Gift Card Info", @@ -66,6 +66,6 @@ return [ "giftcards_upc_database" => "Barcode Database", "giftcards_update" => "Update Gift Card", "giftcards_use_inventory_menu" => "Use Inventory Menu", - "giftcards_value" => "Gift Card Value must be a number", - "giftcards_value_required" => "Gift Card Value is a required field", + "giftcards_value" => "Gift Card Value must be a number.", + "giftcards_value_required" => "Gift Card Value is a required field.", ]; diff --git a/app/Language/en-GB/Reports.php b/app/Language/en-GB/Reports.php index 69c53a6cc..0ca7a45c3 100644 --- a/app/Language/en-GB/Reports.php +++ b/app/Language/en-GB/Reports.php @@ -19,8 +19,8 @@ return [ "reports_completed_sales" => "Completed Sales", "reports_confirm_delete" => "Are you sure you want to delete the selected entry(ies)?", "reports_confirm_restore" => "Are you sure you want to restore the selected entry(ies)?", - "reports_cost" => "Cost", - "reports_cost_price" => "Cost Price", + "reports_cost" => "Wholesale", + "reports_cost_price" => "Wholesale Price", "reports_count" => "Count", "reports_customer" => "Customer", "reports_customers" => "Customers", @@ -73,12 +73,12 @@ return [ "reports_low_sell_quantity" => "Low Sell Qty", "reports_more_than_zero" => "More than zero", "reports_name" => "Name", - "reports_no_reports_to_display" => "No Items to display", + "reports_no_reports_to_display" => "No Items to display.", "reports_payment_type" => "Payment Type", "reports_payments" => "Payments", "reports_payments_summary_report" => "Payments Summary Report", "reports_profit" => "Profit", - "reports_quantity" => "Qty", + "reports_quantity" => "Quantity", "reports_quantity_purchased" => "Quantity Purchased", "reports_quotes" => "Quotes", "reports_received_by" => "Received By", @@ -115,14 +115,14 @@ return [ "reports_stock_location" => "Stock Location", "reports_sub_total_value" => "Sub Total", "reports_subtotal" => "Sub Total", - "reports_summary_reports" => "Sales Summary Reports", + "reports_summary_reports" => "Summary Reports", "reports_supplied_by" => "Supplied by", "reports_supplier" => "Supplier", "reports_suppliers" => "Suppliers", "reports_suppliers_summary_report" => "Suppliers Summary Report", "reports_tax" => "Tax", "reports_tax_category" => "Tax Category", - "reports_tax_name" => "", + "reports_tax_name" => "Tax Name", "reports_tax_percent" => "Tax Percent", "reports_tax_rate" => "Tax Rate", "reports_taxes" => "Taxes", diff --git a/app/Language/en-US/Config.php b/app/Language/en-US/Config.php index 882d283f0..d4d8d221a 100644 --- a/app/Language/en-US/Config.php +++ b/app/Language/en-US/Config.php @@ -100,7 +100,7 @@ return [ "default_tax_rate_number" => "Default Tax Rate must be a number.", "default_tax_rate_required" => "Default Tax Rate is a required field.", "derive_sale_quantity" => "Allow Derived Sale Quantity", - "derive_sale_quantity_tooltip" => "If checked then a new item type will provided for items ordered by extended amount", + "derive_sale_quantity_tooltip" => "If checked then a new item type will be provided for items ordered by extended amount", "dinner_table" => "Table", "dinner_table_duplicate" => "Table must be unique.", "dinner_table_enable" => "Enable Dinner Tables", @@ -130,7 +130,7 @@ return [ "enforce_privacy" => "Enforce privacy", "enforce_privacy_tooltip" => "Protect Customers privacy enforcing data scrambling in case of their data being deleted", "fax" => "Fax", - "file_perm" => "There are problems with file permissions please fix and reload this page.", + "file_perm" => "There are problems with file permissions. Please fix and reload this page.", "financial_year" => "Fiscal Year Start", "financial_year_apr" => "1st of April", "financial_year_aug" => "1st of August", diff --git a/app/Language/en-US/Customers.php b/app/Language/en-US/Customers.php index d8d888289..422a9e007 100644 --- a/app/Language/en-US/Customers.php +++ b/app/Language/en-US/Customers.php @@ -2,7 +2,7 @@ return [ "account_number" => "Account #", "account_number_duplicate" => "Account Number is already present in the database.", - "available_points" => "Available Points", + "available_points" => "Points Available", "available_points_value" => "", "average" => "Average spent", "avg_discount" => "Average discount", @@ -41,7 +41,7 @@ return [ "min" => "Min. spent", "new" => "New Customer", "none_selected" => "You have not selected any customer(s) to delete.", - "one_or_multiple" => "customer(s)", + "one_or_multiple" => "Customer(s)", "quantity" => "Quantity", "stats_info" => "Stats", "successful_adding" => "You have successfully added customer", diff --git a/app/Language/en-US/Sales.php b/app/Language/en-US/Sales.php index 2c1ba289d..4e3cc4423 100644 --- a/app/Language/en-US/Sales.php +++ b/app/Language/en-US/Sales.php @@ -1,6 +1,6 @@ "Available Points", + "customers_available_points" => "Points Available", "rewards_package" => "Rewards", "rewards_remaining_balance" => "Reward Points remaining value is ", "account_number" => "Account #", @@ -40,7 +40,7 @@ return [ "customer_discount" => "Discount", "customer_email" => "Email", "customer_location" => "Location", - "customer_mailchimp_status" => "MailChimp status", + "customer_mailchimp_status" => "MailChimp Status", "customer_optional" => "(Required for Due Payments)", "customer_required" => "(Required)", "customer_total" => "Total", diff --git a/app/Language/en-US/Taxes.php b/app/Language/en-US/Taxes.php index cd1939fe2..d9b334450 100644 --- a/app/Language/en-US/Taxes.php +++ b/app/Language/en-US/Taxes.php @@ -33,15 +33,15 @@ return [ "tax_categories_saved_unsuccessfully" => "Tax Categories changes not saved", "tax_category" => "Tax Category", "tax_category_code" => "Tax Category Code", - "tax_category_duplicate" => "Duplicate tax category", - "tax_category_invalid_chars" => "Invalid characters in tax category name", + "tax_category_duplicate" => "Duplicate Tax Category", + "tax_category_invalid_chars" => "Invalid characters in Tax Category name", "tax_category_name" => "Tax Category Name", "tax_category_new" => "New Tax Category", - "tax_category_required" => "Tax category is required", + "tax_category_required" => "Tax Category is required", "tax_code" => "Tax Code", "tax_code_cannot_be_deleted" => "Tax Code delete failed", - "tax_code_duplicate" => "Duplicate tax code", - "tax_code_invalid_chars" => "Invalid characters in tax code", + "tax_code_duplicate" => "Duplicate Tax Code", + "tax_code_invalid_chars" => "Invalid characters in Tax Code", "tax_code_name" => "Tax Code Name", "tax_code_required" => "Tax Code is a required field", "tax_code_successful_deleted" => "You have successfully deleted Tax Code", @@ -59,9 +59,9 @@ return [ "tax_group_sequence" => "Tax Group Sequence", "tax_included" => "Tax included", "tax_jurisdiction" => "Tax Jurisdiction", - "tax_jurisdiction_duplicate" => "Duplicate tax jurisdiction", - "tax_jurisdiction_invalid_chars" => "Invalid characters in jurisdiction name", - "tax_jurisdiction_required" => "Tax jurisdiction is required", + "tax_jurisdiction_duplicate" => "Duplicate Tax Jurisdiction", + "tax_jurisdiction_invalid_chars" => "Invalid characters in Tax Jurisdiction name", + "tax_jurisdiction_required" => "Tax Jurisdiction is required", "tax_jurisdictions" => "Tax Jurisdictions", "tax_jurisdictions_configuration" => "Tax Jurisdictions Configuration", "tax_jurisdictions_saved_successfully" => "Tax Jurisdiction changes saved", diff --git a/app/Language/fr/Expenses_categories.php b/app/Language/fr/Expenses_categories.php index 963e2a9e6..70ab3e64d 100644 --- a/app/Language/fr/Expenses_categories.php +++ b/app/Language/fr/Expenses_categories.php @@ -5,7 +5,7 @@ return [ "expenses_categories_cannot_be_deleted" => "Impossible de supprimer la ou les dépenses de catégorie", "expenses_categories_category_id" => "ID", "expenses_categories_confirm_delete" => "Êtes-vous sûr de vouloir supprimer la catégorie de dépenses sélectionnée ?", - "expenses_categories_confirm_restore" => "Êtes-vous certain de vouloir restorer la catégorie de dépenses selectionnée ?", + "expenses_categories_confirm_restore" => "Voulez-vous restaurer la Catégorie de Dépense selectionnée ?", "expenses_categories_description" => "Description de la catégorie", "expenses_categories_error_adding_updating" => "Erreur lors de l'ajout / mise à jour de la catégorie de dépenses", "expenses_categories_info" => "Catégorie Info sur les dépenses", diff --git a/app/Views/configs/system_info.php b/app/Views/configs/system_info.php index 3ccdc9e93..7d7e1be3e 100644 --- a/app/Views/configs/system_info.php +++ b/app/Views/configs/system_info.php @@ -25,6 +25,7 @@ Enabled ✓' : 'Disabled ✗', '
'; echo "» BC Math: ", extension_loaded('bcmath') ? 'Enabled ✓' : 'Disabled ✗', '
'; + echo "» XML: ", extension_loaded('xml') ? 'Enabled ✓' : 'Disabled ✗', '
'; echo "» INTL: ", extension_loaded('intl') ? 'Enabled ✓' : 'Disabled ✗', '
'; echo "» OpenSSL: ", extension_loaded('openssl') ? 'Enabled ✓' : 'Disabled ✗', '
'; echo "» MBString: ", extension_loaded('mbstring') ? 'Enabled ✓' : 'Disabled ✗', '
';