Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
clean up i18n translations for `core` and `admin`
Łukasz Adamczykd6b957d7c52f
diff --git a/admin/app/helpers/spree/admin/orders_helper.rb b/admin/app/helpers/spree/admin/orders_helper.rbindex 1c062ccdec..0e44a1910e 100644--- a/admin/app/helpers/spree/admin/orders_helper.rb+++ b/admin/app/helpers/spree/admin/orders_helper.rb@@ -48,7 +48,7 @@ module Spreeelsif shipment_state == 'partial'icon('progress-check') + Spree.t('shipment_states.partial')elsif shipment_state == 'canceled'- icon('cancel') + Spree.t('shipment_states.cancelled')+ icon('cancel') + Spree.t('shipment_states.canceled')elseicon('progress') + Spree.t("shipment_states.#{shipment_state}")end@@ -154,7 +154,7 @@ module Spreeelsif params[:q][:shipment_state_eq] == 'shipped'Spree.t('admin.orders.fulfilled')elsif params[:q][:state_in] == ['canceled','partially_canceled']- Spree.t('admin.orders.cancelled')+ Spree.t('admin.orders.canceled')elsif params.dig(:q, :refunded) && params[:q][:refunded].present?Spree.t('admin.orders.refunded')elsif params.dig(:q, :partially_refunded) && params[:q][:partially_refunded].present?diff --git a/admin/app/views/spree/admin/oauth_applications/create.turbo_stream.erb b/admin/app/views/spree/admin/oauth_applications/create.turbo_stream.erbindex b07d9e6036..2b15c74477 100644--- a/admin/app/views/spree/admin/oauth_applications/create.turbo_stream.erb+++ b/admin/app/views/spree/admin/oauth_applications/create.turbo_stream.erb@@ -9,7 +9,7 @@<div class="input-append"><button data-action="clipboard#copy" class="btn btn-light"><%= icon 'clone.svg', class: 'mr-2' %>- <%= Spree.t(:copy_to_clipboard, scope: :admin ) %>+ <%= Spree.t('admin.copy_to_clipboard') %></button></div></div>@@ -24,7 +24,7 @@<div class="input-append"><button data-action="clipboard#copy" class="btn btn-light"><%= icon 'clone.svg', class: 'mr-2' %>- <%= Spree.t(:copy_to_clipboard, scope: :admin ) %>+ <%= Spree.t('admin.copy_to_clipboard') %></button></div></div>diff --git a/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb b/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erbindex 656684d18f..80b4524464 100644--- a/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb+++ b/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb@@ -3,7 +3,7 @@<button class="btn btn-light h-100 dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false"><span class="text-muted font-weight-normal"><%= Spree.t(:show) %>- </span>+ </span><%= order_filter_dropdown_value %></button><div class="dropdown-menu dropdown-menu-right w-100" style="min-width: 200px">@@ -20,7 +20,7 @@<%= link_to Spree.t('admin.orders.fulfilled'),params.to_unsafe_h.deep_merge({q: {shipment_state_eq: :shipped, shipment_state_not_in: '', state_eq: '', state_in: '', refunded: '', partially_refunded: ''}}),class: "dropdown-item #{'active' if params[:q][:shipment_state_eq] == 'shipped'}" %>- <%= link_to Spree.t('admin.orders.cancelled'),+ <%= link_to Spree.t('admin.orders.canceled'),params.to_unsafe_h.deep_merge({q: {state_eq: nil, state_in: [:canceled, :partially_canceled], shipment_state_not_in: '', shipment_state_eq: '', refunded: '', partially_refunded: ''}}),class: "dropdown-item #{'active' if params[:q][:state_in] == ['canceled','partially_canceled']}" %><%= link_to Spree.t('admin.orders.refunded'),diff --git a/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erbindex cbb85b6244..dfd41fa9f5 100644--- a/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb@@ -13,16 +13,16 @@<li class="nav-item"><%= active_link_to_with_icon('building-store', Spree.t(:store_details), spree.edit_admin_store_path(section: 'general-settings'), class: 'nav-link', active: params[:section] == 'general-settings') %></li>-+<% if defined?(current_account) && current_account.present? %><li class="nav-item">- <%= active_link_to_with_icon 'receipt', I18n.t(:account), main_app.edit_account_path(current_account), class: 'nav-link' %>+ <%= active_link_to_with_icon 'receipt', Spree.t(:account), main_app.edit_account_path(current_account), class: 'nav-link' %></li><li class="nav-item">- <%= active_link_to_with_icon 'users', I18n.t(:account_members), main_app.account_members_path(current_account), class: 'nav-link rounded-lg ' %>+ <%= active_link_to_with_icon 'users', Spree.t(:account_members), main_app.account_members_path(current_account), class: 'nav-link rounded-lg ' %></li><% end %>-+<li class="nav-item"><%= active_link_to_with_icon('send', Spree.t(:emails), spree.edit_admin_store_path(section: 'emails'), class: 'nav-link', active: params[:section] == 'emails') %></li>@@ -171,7 +171,7 @@<div class="text-uppercase small ml-2 mb-1 text-muted"><%= Spree.t(:settings) %></div><% if defined?(current_account) && current_account.present? %><li class="nav-item">- <%= active_link_to_with_icon 'users', I18n.t(:account_members), main_app.account_members_path(current_account), class: 'nav-link' %>+ <%= active_link_to_with_icon 'users', Spree.t(:account_members), main_app.account_members_path(current_account), class: 'nav-link' %></li><% end %><li class="nav-item">diff --git a/admin/config/i18n-tasks.yml b/admin/config/i18n-tasks.ymlnew file mode 100644index 0000000000..2b20fd36d3--- /dev/null+++ b/admin/config/i18n-tasks.yml@@ -0,0 +1,190 @@+# i18n-tasks finds and manages missing and unused translations: https://github.com/glebm/i18n-tasks++# The "main" locale.+base_locale: en+## All available locales are inferred from the data by default. Alternatively, specify them explicitly:+# locales: [es, fr]+## Reporting locale, default: en. Available: en, ru.+# internal_locale: en++# Read and write translations.+data:+ ## Translations are read from the file system. Supported format: YAML, JSON.+ ## Provide a custom adapter:+ # adapter: I18n::Tasks::Data::FileSystem++ # Locale files or `Dir.glob` patterns where translations are read from:+ read:+ ## Default:+ - config/locales/%{locale}.yml+ ## More files:+ # - config/locales/**/*.%{locale}.yml++ # Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom:+ # `i18n-tasks normalize -p` will force move the keys according to these rules+ write:+ ## For example, write devise and simple form keys to their respective files:+ # - ['{devise, simple_form}.*', 'config/locales/\1.%{locale}.yml']+ ## Catch-all default:+ # - config/locales/%{locale}.yml++ # External locale data (e.g. gems).+ # This data is not considered unused and is never written to.+ external:+ ## Example (replace %#= with %=):+ # - "<%#= %x[bundle info vagrant --path].chomp %>/templates/locales/%{locale}.yml"+ - "<%= %x[bundle info spree_core --path].chomp %>/config/locales/%{locale}.yml"++ ## Specify the router (see Readme for details). Valid values: conservative_router, pattern_router, or a custom class.+ # router: conservative_router++ yaml:+ write:+ # do not wrap lines at 80 characters+ line_width: -1++ ## Pretty-print JSON:+ # json:+ # write:+ # indent: ' '+ # space: ' '+ # object_nl: "\n"+ # array_nl: "\n"++# Find translate calls+search:+ ## Paths or `Find.find` patterns to search in:+ # paths:+ # - app/++ ## Root directories for relative keys resolution.+ # relative_roots:+ # - app/controllers+ # - app/helpers+ # - app/mailers+ # - app/presenters+ # - app/views++ ## Directories where method names which should not be part of a relative key resolution.+ # By default, if a relative translation is used inside a method, the name of the method will be considered part of the resolved key.+ # Directories listed here will not consider the name of the method part of the resolved key+ #+ # relative_exclude_method_name_paths:+ # -++ ## Files or `File.fnmatch` patterns to exclude from search. Some files are always excluded regardless of this setting:+ ## *.jpg *.jpeg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less+ ## *.yml *.json *.zip *.tar.gz *.swf *.flv *.mp3 *.wav *.flac *.webm *.mp4 *.ogg *.opus *.webp *.map *.xlsx+ exclude:+ - app/assets/images+ - app/assets/fonts+ - app/assets/videos+ - app/assets/builds++ ## Alternatively, the only files or `File.fnmatch patterns` to search in `paths`:+ ## If specified, this settings takes priority over `exclude`, but `exclude` still applies.+ # only: ["*.rb", "*.html.slim"]++ ## If `strict` is `false`, guess usages such as t("categories.#{category}.title"). The default is `true`.+ strict: false++ ## Allows adding ast_matchers for finding translations using the AST-scanners+ ## The available matchers are:+ ## - RailsModelMatcher+ ## Matches ActiveRecord translations like+ ## User.human_attribute_name(:email) and User.model_name.human+ ## - DefaultI18nSubjectMatcher+ ## Matches ActionMailer's default_i18n_subject method+ ##+ ## To implement your own, please see `I18n::Tasks::Scanners::AstMatchers::BaseMatcher`.+ # ast_matchers:+ # - 'I18n::Tasks::Scanners::AstMatchers::RailsModelMatcher'+ # - 'I18n::Tasks::Scanners::AstMatchers::DefaultI18nSubjectMatcher'++ ## Multiple scanners can be used. Their results are merged.+ ## The options specified above are passed down to each scanner. Per-scanner options can be specified as well.+ ## See this example of a custom scanner: https://github.com/glebm/i18n-tasks/wiki/A-custom-scanner-example++## Translation Services+# translation:+# # Google Translate+# # Get an API key and set billing info at https://code.google.com/apis/console to use Google Translate+# google_translate_api_key: "AbC-dEf5"+# # DeepL Pro Translate+# # Get an API key and subscription at https://www.deepl.com/pro to use DeepL Pro+# deepl_api_key: "48E92789-57A3-466A-9959-1A1A1A1A1A1A"+# # deepl_host: "https://api.deepl.com"+# # deepl_version: "v2"+# # deepl_glossary_ids:+# # - f28106eb-0e06-489e-82c6-8215d6f95089+# # - 2c6415be-1852-4f54-9e1b-d800463496b4+# # add additional options to the DeepL.translate call: https://www.deepl.com/docs-api/translate-text/translate-text/+# deepl_options:+# formality: prefer_less+# # OpenAI+# openai_api_key: "sk-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"+# # openai_model: "gpt-3.5-turbo" # see https://platform.openai.com/docs/models+# # may contain `%{from}` and `%{to}`, which will be replaced by source and target locale codes, respectively (using `Kernel.format`)+# # openai_system_prompt: >-+# # You are a professional translator that translates content from the %{from} locale+# # to the %{to} locale in an i18n locale array.+# #+# # The array has a structured format and contains multiple strings. Your task is to translate+# # each of these strings and create a new array with the translated strings.+# #+# # HTML markups (enclosed in < and > characters) must not be changed under any circumstance.+# # Variables (starting with %%{ and ending with }) must not be changed under any circumstance.+# #+# # Keep in mind the context of all the strings for a more accurate translation.++## Do not consider these keys missing:+# ignore_missing:+# - 'errors.messages.{accepted,blank,invalid,too_short,too_long}'+# - '{devise,simple_form}.*'++## Consider these keys used:+# ignore_unused:+# - 'activerecord.attributes.*'+# - '{devise,kaminari,will_paginate}.*'+# - 'simple_form.{yes,no}'+# - 'simple_form.{placeholders,hints,labels}.*'+# - 'simple_form.{error_notification,required}.:'+ignore_unused:+ - 'spree.admin.bulk_ops.products.body.*'+ - 'spree.admin.bulk_ops.products.title.*'+ - 'spree.admin.bulk_ops.users.body.*'+ - 'spree.admin.bulk_ops.users.title.*'+ - 'spree.admin.display_on_options.*'+ - 'spree.admin.order.events.*'+ - 'spree.admin.orders.no_email_present'+ - 'spree.admin.orders.payment_link_sent'+ - 'spree.admin.store_setup_tasks.*'+ - 'spree.admin.taxon_rules.*'+ - 'spree.admin.webhooks_subscribers.*'++## Exclude these keys from the `i18n-tasks eq-base' report:+# ignore_eq_base:+# all:+# - common.ok+# fr,es:+# - common.brand++## Exclude these keys from the `i18n-tasks check-consistent-interpolations` report:+# ignore_inconsistent_interpolations:+# - 'activerecord.attributes.*'++## Ignore these keys completely:+# ignore:+# - kaminari.*++## Sometimes, it isn't possible for i18n-tasks to match the key correctly,+## e.g. in case of a relative key defined in a helper method.+## In these cases you can use the built-in PatternMapper to map patterns to keys, e.g.:+#+# <%# I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',+# only: %w(*.html.haml *.html.slim),+# patterns: [['= title\b', '.page_title']] %>+#+# The PatternMapper can also match key literals via a special %{key} interpolation, e.g.:+#+<% I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper', patterns: [['\bSpree\.t[( ]\s*%{key}', 'spree.%{key}']] %>diff --git a/admin/config/locales/en.yml b/admin/config/locales/en.ymlindex 94a4b0ffdc..38ffa62983 100644--- a/admin/config/locales/en.yml+++ b/admin/config/locales/en.yml@@ -1,235 +1,242 @@+---en:spree:admin:+ active: Activeadd_tracking_details: Add tracking details+ amount_spent: Amount spentaudit_log: Audit Log- url: URL- active: Active- name: Name- successful: Successful- created_at: Created At- response_code: Response Code- execution_time: Execution Time- request_errors: Request Errors- edit_profile: Edit Profile- personal_details: Personal Details- notifications: Notifications- filters: Filters- kind: Kind- home: Home+ avg_order_value: Avg. Order Value+ bulk_ops:+ products:+ body:+ add_tags: 'Select tags to add to the products:'+ add_to_brand: 'Select which brand to add the products to:'+ add_to_taxons: 'Select which taxons to add the products to:'+ remove_from_taxons: 'Select which taxons to remove the products from:'+ remove_tags: 'Select tags to remove from the products:'+ set_return_rule: Select return rule for products+ set_status:+ active: Setting products to active will make those products available on the storefront.+ archived: Setting products to archived will hide them from storefront.+ draft: Setting products to draft will hide them from storefront.+ ready_for_review: We will notify your partners that these products are ready for review. Your partners will be able to review and publish these products.+ status_updated: Status updated+ title:+ add_tags: Add tags+ add_to_brand: Add to brand+ add_to_taxons: Add to taxons+ remove_from_brand: Remove from brand+ remove_from_taxons: Remove from taxons+ remove_tags: Remove tags+ set_return_rule: Set Return Rule+ set_size_chart: Set Size Chart+ set_status: Set as %{status}+ users:+ body:+ add_tags: 'Select tags to add to the customers:'+ remove_tags: 'Select tags to remove from the customers:'+ title:+ add_tags: Add tags+ remove_tags: Remove tags+ copy_payment_link: Copy Payment Linkcopy_to_clipboard: Copy to clipboard+ created_at: Created Atdashboard:- hi: Hi- whats_happening_on: Here's what's happening on <strong>%{store_name}</strong> today.getting_started:description: Everything you need to set up to start selling.- data_feeds:- data_feeds: Data Feeds- type: Type- slug_label: Slug (leave blank to generate)- new_data_feed: New Data Feed- digitals:- digital: Digital- add_new_file: Add a new digital asset.- digital_assets: Digital Assets- reset_download_links: Reset Digital Download Links- downloads_reset: Digital Download Links Reset- no_digital_assets_added: No digital assets.- delete_file_confirmation: "Are you sure you want to delete: %{filename}"- upload: Upload+ hi: Hi+ whats_happening_on: Here's what's happening on <strong>%{store_name}</strong> today.display_on_options:back_end: Only on admin panel- front_end: Only on storefrontboth: On both admin panel & storefront- export_only_filtered_records: Export only filtered records, matching the search criteria- export_all: Export all records (can be slow for large datasets)- export_created: Your export was started. You will receive an email with a download link when it is ready!+ front_end: Only on storefront+ edit_billing_address: Edit billing addressedit_contact_information: Edit contact information+ edit_profile: Edit Profileedit_shipping_address: Edit shipping address- edit_billing_address: Edit billing addressedit_theme: Edit theme+ errors: Errors+ execution_time: Execution Time+ export_all: Export all records (can be slow for large datasets)+ export_created: Your export was started. You will receive an email with a download link when it is ready!+ export_only_filtered_records: Export only filtered records, matching the search criteria+ filters: Filtersgetting_started: Getting started- linkable:- search_for_a_page: Search for a page- search_for_a_taxon: Search for a Taxon- search_for_a_product: Search for a Product- store:- digital_settings:- digital_asset_settings: Digital Asset Settings- limit_digital_download_count: Limit Download Count- limit_digital_download_days: Limit Download Days- digital_asset_authorized_clicks:- authorized_clicks: Authorized Download Count- info: Number of times a download link can be clicked.- digital_asset_authorized_days:- authorized_days: Authorized Download Days- info: The number of days a purchase can be downloaded after purchase.- digital_asset_link_expire_time:- download_link_expire_time: Download Link Expire Time- link_expire_time: Set the expire time of each download link. (seconds).- storefront: Storefront+ manage_currencies: Manage Currencies+ manage_properties: Manage Properties+ manage_stock_locations: Manage Stock Locations+ manage_taxons: Manage Taxons+ manage_zones: Manage Zones+ member_since: Member since+ name: Name+ navigation:+ nested_under: Nested under+ not_tracking_inventory: Not tracking inventory+ notifications: Notifications+ num_orders: No. of Orders+ oauth_applications:+ last_used: Last used+ list: API keys+ never: Never+ new: New API key+ read_and_write: Read & Write+ read_only: Read Only+ scopes: Scopes+ order:+ events:+ approve: Approve+ cancel: Cancel+ resend: Resend+ resume: Resume+ orders:+ add_user_to_this_order: Add customer to this order+ all_orders: All Orders+ canceled: Canceled+ fulfilled: Fulfilled+ no_email_present: Please add an email address to send the payment link+ orders_to_fulfill: Orders to fulfill+ partially_refunded: Partially Refunded+ payment_link_sent: Payment link was sent to the customer+ refunded: Refunded+ remove_user_from_this_order: Remove customer from this order+ unfulfilled: Unfulfilled+ page_builder:+ background_color: Background color+ border_bottom_width: Border bottom width+ border_color: Border color+ border_top_width: Border top width+ bottom_padding: Bottom padding+ button_alignment: Button alignment+ button_background_color: Button background color+ button_style: Button style+ button_text: Button's text+ button_text_color: Button text color+ category: Category+ description: Description+ description_alignment: Description alignment+ desktop_image_alignment: Image alignment for desktop+ desktop_logo_height: Logo height (desktop)+ heading: Heading+ heading_alignment: Heading alignment+ heading_size: Heading size+ height: Height+ left_aligned: Left aligned+ logo_centered: Logo centered+ max_video_width_on_desktop: Max video width on desktop+ maximum_posts_to_show: Maximum posts to show+ maximum_products_to_show: Maximum products to show+ nav_centered: Nav centered+ not_set: Not set+ posts_to_show: Posts to show+ separated: Separated+ show_more_button: Show explore category button+ show_taxon_image: Show taxon image+ text_color: Text color+ title: Title+ top_padding: Top padding+ use_description_from_admin: Use description from admin+ vertical_alignment: Vertical alignment+ youtube_video_url: Youtube video URL+ personal_details: Personal Details+ products:+ active: Active+ all_statuses: All statuses+ any_stock: Any stock+ archived: Archived+ by_status: By status+ by_stock: By stock+ deleted: Deleted+ draft: Draft+ help_bubble: Draft & Ready for Review statuses mean that the product isn't available for purchase. Active means that the product is live. Vendors can move product from draft to ready for review, but only marketplace operators can move product from ready for review to active+ in_stock: In Stock+ inventory:+ barcode: Barcode (ISBN, UPC, GTIN, etc.)+ sku: SKU (Stock Keeping Unit)+ out_of_stock: Out of Stock+ paused: Paused+ search_results:+ no_products: We couldn't find any products matching your search :(+ selected: products selected+ seo:+ placeholder: Add a title and description to see how this product might appear in a search engine listing+ status_form:+ available_on: Marks when the product will be released, put a future date to indicate that this is a pre-order+ discontinue_on: Marks when the product should be automatically taken off from your site+ make_active_at: Marks when the product should be automatically promoted to "active" state+ status: Draft - initial status. Ready For Review - inform store owner that product can be checked before activation+ stores:+ choose_stores: Choose which stores this product should be available in+ variants:+ option_types_link: To add more option types please go to <a href="%{link}">Option Types</a>+ report_created: Your report is being generated. You will receive an email with a download link when it is ready!+ response_code: Response Code+ send_payment_link: Send Payment Link+ shipment_transfer:+ wrong_destination: Wrong destination+ stock_transfers:+ add_products_tip: You need to select a destination location first+ store_form:+ customer_support_email_help: This email is visible to your Store visitors in the Footer section+ new_order_notifications_email_help: If you want to receive an email notification every time someone places an Order please provide an email address for that notification to be sent tostore_setup_tasks:add_billing_address: Add billing address- setup_taxes_collection: Setup taxes collectionadd_products: Add products- set_customer_support_email: Set customer support emailpayment_methods:- title: Please setup Payment Methods for your store- done: You're all set! You can always manage your Payment Methods on <a href="%{link}" data-turbo-frame="_top">this</a> page.copy: In order to collect payments, please setup at least one online payment provider.+ done: You're all set! You can always manage your Payment Methods on <a href="%{link}" data-turbo-frame="_top">this</a> page.setup: Setup Payment Methods+ title: Please setup Payment Methods for your store+ set_customer_support_email: Set customer support email+ setup_taxes_collection: Setup taxes collectiontaxes:- done: You're all set! You can always manage your taxes on the <a href="%{link}" data-turbo-frame="_top">settings</a> page.copy: In order to collect taxes, please setup your tax rates.+ done: You're all set! You can always manage your taxes on the <a href="%{link}" data-turbo-frame="_top">settings</a> page.setup: Setup Tax Rates- product_kinds:- physical: Physical- digital: Digital- report_created: Your report is being generated. You will receive an email with a download link when it is ready!- tab:- configuration: Configuration- content: Content- option_types: Option Types- orders: Orders- overview: Overview- pages: Pages- products: Products- promotions: Promotions- promotion_categories: Promotion Categories- properties: Properties- prototypes: Prototypes- reports: Reports- navigation: Navigation- taxonomies: Taxonomies- taxons: Taxons- users: Users- return_authorizations: Return Authorizations- stock: Stock- customer_returns: Customer Returns- apps: Apps- applications: Applications- integrations: Integrations- webhook_subscribers: Webhook Subscribers- taxon:- nested_under_info: Nest this Taxon within the Taxonomy tree.- taxonomies:- edit_root_taxonomy: Edit %{name} Taxonomy- taxonomies: Taxonomies- taxons_belonging_to: "Taxons Belonging To %{taxonomy_name}"- submenu: Submenu- add_new_taxon: Add a new Taxon- no_taxons: '<b>%{taxonomy}</b> has no Taxons. Click the <b>Add a new Taxon</b> button, to begin adding Taxons.'- taxon_type: Taxon type- taxon_types:- manual: Manual- manual_info: Curate products manually. You can add or remove them in bulk.- automatic: Automatic- automatic_info: Automatically match products to this taxon based on the conditions you set.+ storefront: Storefront+ successful: Successfultaxon_rules:- products_must_match: "Products must match:"all_conditions: all conditionsany_condition: any condition- tag: Product tagavailable_on: Available on- on_sale: On salematch_policies:- is_equal_to: is equal to- is_not_equal_to: is not equal tocontains: containsdoes_not_contain: does not contain- manage_stock_locations: Manage Stock Locations- manage_properties: Manage Properties- manage_currencies: Manage Currencies- manage_zones: Manage Zones- manage_taxons: Manage Taxons- not_tracking_inventory: Not tracking inventory- send_payment_link: Send Payment Link- copy_payment_link: Copy Payment Link- order:- changing_store_warning: If you change the store this order belongs to, the order will be reset.- once_an_order_is_complete_you_can_not_change_store: 'Sorry, once an order is complete, you can no longer change the store that the order belongs to.'- events:- approve: Approve- cancel: Cancel- resume: Resume- resend: Resend- orders:- all: All- unpaid: Unpaid- fulfilled: Fulfilled- unfulfilled: Unfulfilled- cancelled: Cancelled- refunded: Refunded- partially_refunded: Partially Refunded- cart: Cart- all_orders: All Orders- draft_orders: Draft Orders- abandoned_checkouts: Abandoned Checkouts- orders_to_fulfill: Orders to fulfill- remove_user_from_this_order: Remove customer from this order- add_user_to_this_order: Add customer to this order- payment_link_sent: Payment link was sent to the customer- no_email_present: Please add an email address to send the payment link- oauth_applications:- list: API keys- new: New API key- uid: UID- scopes: Scopes- last_used: Last used- never: Never- read_only: Read Only- read_and_write: Read & Write- documentation_message: 'To learn how to authenticate requests to the Platform API, '- documentation_cta: see the documentation- reports:- for: For %{store_name}- return_authorization:- product: Product- store_form:- look_and_feel: Look and feel- code_help: "Store unique identifier, which is an abbreviated version of the store’s name (used as the layout directory name, and also helpful for separating templates by store)"- checkout_zone_help: "Selecting zone will limit to which Countries or States products are shipped.- For more information <a href='https://guides.spreecommerce.org/user/configuration/configuring_geography.html#zones' target='_blank' class='alert-link'>please see documentation</a>"- currencies_help: "You can accept payments in multiple currencies. Each product and product variant can have different price in different currency"- locales_help: "Install <a href='https://github.com/spree-contrib/spree_i18n' target='_blank' class='alert-link'>Spree I18n extension</a> to add more locales"- default_locale_notice: "Warning: Before changing the default locale, ensure that all products, taxons and stores have translations in the new locale"- social_help: "If you want to link to your social accounts in the footer part of your website please fill below fields"- default_country_help: "This is the Country that will be pre-selected on the Checkout Address form"- footer_help: "This content is visible in the footer section of your Store"- mail_from_address_help: "This is the email which will be the sender of all your Store emails (Order Confirmation, Shipment notification etc)"- customer_support_email_help: "This email is visible to your Store visitors in the Footer section"- new_order_notifications_email_help: "If you want to receive an email notification every time someone places an Order please provide an email address for that notification to be sent to"- seo_robots: "Please check <a href='https://developers.google.com/search/reference/robots_meta_tag' target='_blank'>this page for more help</a>"+ is_equal_to: is equal to+ is_not_equal_to: is not equal to+ on_sale: On sale+ products_must_match: 'Products must match:'+ tag: Product tag+ taxon_type: Taxon type+ taxon_types:+ automatic: Automatic+ automatic_info: Automatically match products to this taxon based on the conditions you set.+ manual: Manual+ manual_info: Curate products manually. You can add or remove them in bulk.+ url: URLuser:- account: Account- addresses: Addresses- items: Items- items_purchased: Items Purchased+ available_store_credit: User has %{amount} in Store Credit available.last_order_placed: Last order placed- order_history: Order History- order_num: "Order #"- orders: Orders- user_information: User Information- stores: Stores- store_credits: Store Creditsno_store_credit: User has no Store Credit available.- available_store_credit: User has %{amount} in Store Credit available.- settings: Settings- stock_transfers:- add_products_tip: You need to select a destination location first+ users:+ filters:+ search_placeholder: Search customers by email or nameutilities:preview: Preview+ variants:+ search_results:+ no_variants: We couldn't find any variants matching your search :(+ variants_form:+ add_option:+ empty: Add options like size or color+ not_empty: Add another option+ compare_at_price_description: This price is used to shown marked price on the product page.+ stock_locations_link: To add more stock locations please go to <a href="%{link}">Stock Locations</a>+ total_inventory_html: 'Total inventory at %{stock_location} location: %{count} available'+ view_all_orders: View all orderswebhooks_subscribers:- webhooks_subscribers: Webhooks Subscribers- new_webhooks_subscriber: New Webhooks Subscriber- webhooks_events: Webhooks Events- subscriptions: Subscriptions- time_of_last_event: Time of Last Event- all_events: All Events- no_events: No Events- subscribe_to_all_events: Subscribe to all events- select_events: Select eventsaddresses: Addresses+ all_events: All Eventsassets: Assetscredit_cards: Credit Cardscustomer_returns: Customer Returns@@ -237,11 +244,13 @@ en:digitals: Digitalsinventory_units: Inventory Unitsline_items: Line Items+ new_webhooks_subscriber: New Webhooks Subscriber+ no_events: No Eventsoption_types: Option Typesoption_values: Option Valuesorders: Orders- payments: Paymentspayment_capture_events: Payment Capture Events+ payments: Paymentsprices: Pricesproducts: Productspromotions: Promotions@@ -252,9 +261,10 @@ en:return_authorizations: Return Authorizationsreturn_items: Return Itemsroles: Roles- shipments: Shipments+ select_events: Select eventsshipment_transfer:wrong_destination: Selected location is not a valid destination+ shipments: Shipmentsshipping_categories: Shipping Categoriesshipping_methods: Shipping Methodsshipping_rates: Shipping Rates@@ -264,146 +274,15 @@ en:stock_transfers: Stock Transfersstore_credits: Store Creditsstores: Stores+ subscribe_to_all_events: Subscribe to all events+ subscriptions: Subscriptionstax_rates: Tax Ratestaxonomies: Taxonomiestaxons: Taxons+ time_of_last_event: Time of Last Eventvariants: Variants+ webhooks_events: Webhooks Events+ webhooks_subscribers: Webhooks Subscriberswished_items: Wished Itemswishlists: Wishlistszones: Zones- product:- all: All- active: Active- archived: Archived- deleted: Deleted- draft: Draft- pre_order: Pre-order- payment_methods:- edit:- payment_method_configuration: "Payment Method Configuration"- bulk_ops:- set: Set- stock_items:- set_backorderable_to_false: Set Backorderable to false- set_backorderable_to_true: Set Backorderable to true- set_track_inventory_to_false: Disable Inventory Tracking- set_track_inventory_to_true: Enable Inventory Tracking- backorderable_explanation: Backorderable indicates if a stock item can be backordered when it runs out.- track_inventory_explanation: Enable/disable tracking the inventory for stock items.- users:- title:- add_tags: Add tags- remove_tags: Remove tags- body:- add_tags: 'Select tags to add to the customers:'- remove_tags: 'Select tags to remove from the customers:'- products:- title:- set_status: Set as %{status}- add_to_taxons: Add to taxons- remove_from_taxons: Remove from taxons- add_tags: Add tags- remove_tags: Remove tags- add_to_brand: Add to brand- remove_from_brand: Remove from brand- set_size_chart: Set Size Chart- set_return_rule: Set Return Rule- body:- set_status:- draft: Setting products to draft will hide them from storefront.- ready_for_review: We will notify your partners that these products are ready for review. Your partners will be able to review and publish these products.- active: Setting products to active will make those products available on the storefront.- archived: Setting products to archived will hide them from storefront.- remove_from_taxons: 'Select which taxons to remove the products from:'- add_to_taxons: 'Select which taxons to add the products to:'- add_to_brand: 'Select which brand to add the products to:'- add_tags: 'Select tags to add to the products:'- remove_tags: 'Select tags to remove from the products:'- set_return_rule: Select return rule for products- products:- active: Active- draft: Draft- archived: Archived- all_statuses: All statuses- by_status: By status- all_products: All Products- paused: Paused- in_stock: In Stock- out_of_stock: Out of Stock- any_stock: Any stock- by_stock: By stock- selected: products selected- help_bubble: Draft & Ready for Review statuses mean that the product isn't available for purchase. Active means that the product is live. Vendors can move product from draft to ready for review, but only marketplace operators can move product from ready for review to active- search_results:- no_products: We couldn't find any products matching your search :(- inventory:- sku: SKU (Stock Keeping Unit)- barcode: Barcode (ISBN, UPC, GTIN, etc.)- properties:- link: To manage properties, go to <a href="%{link}">Properties</a>.- status_form:- status: Draft - initial status. Ready For Review - inform store owner that product can be checked before activation- make_active_at: Marks when the product should be automatically promoted to "active" state- available_on: Marks when the product will be released, put a future date to indicate that this is a pre-order- discontinue_on: Marks when the product should be automatically taken off from your site- stores:- choose_stores: Choose which stores this product should be available in- seo:- placeholder: Add a title and description to see how this product might appear in a search engine listing- variants:- option_types_link: To add more option types please go to <a href="%{link}">Option Types</a>- variants:- search_results:- no_variants: We couldn't find any variants matching your search :(- variants_form:- currencies_link: To add more currencies, go to <a href="%{link}">Store Settings</a>- stock_locations_link: To add more stock locations please go to <a href="%{link}">Stock Locations</a>- compare_at_price_description: This price is used to shown marked price on the product page.- add_option:- empty: Add options like size or color- not_empty: Add another option- total_inventory_html: "Total inventory at %{stock_location} location: %{count} available"- page_builder:- show_more_button: Show explore category button- heading: Heading- heading_size: Heading size- heading_alignment: Heading alignment- description_alignment: Description alignment- use_description_from_admin: Use description from admin- button_text: Button's text- show_taxon_image: Show taxon image- category: Category- maximum_products_to_show: Maximum products to show- button_style: Button style- posts_to_show: Posts to show- maximum_posts_to_show: Maximum posts to show- desktop_image_alignment: Image alignment for desktop- vertical_alignment: Vertical alignment- overlay_transparency: Overlay transparency- title: Title- separated: Separated- youtube_video_url: Youtube video URL- max_video_width_on_desktop: Max video width on desktop- border_color: Border color- border_top_width: Border top width- border_bottom_width: Border bottom width- bottom_padding: Bottom padding- button_background_color: Button background color- button_text_color: Button text color- desktop_logo_height: Logo height (desktop)- height: Height- nav_centered: Nav centered- logo_centered: Logo centered- left_aligned: Left aligned- text_color: Text color- top_padding: Top padding- button_alignment: Button alignment- not_set: Not set- view_all_orders: View all orders- amount_spent: Amount spent- avg_order_value: Avg. Order Value- num_orders: No. of Orders- member_since: Member since- users:- filters:- search_placeholder: Search customers by email or namediff --git a/admin/spec/i18n_spec.rb b/admin/spec/i18n_spec.rbnew file mode 100644index 0000000000..98d90f9407--- /dev/null+++ b/admin/spec/i18n_spec.rb@@ -0,0 +1,33 @@+require 'spec_helper'+require 'i18n/tasks'++RSpec.describe I18n do+ let(:i18n) { I18n::Tasks::BaseTask.new }+ let(:missing_keys) { i18n.missing_keys }+ let(:unused_keys) { i18n.unused_keys }+ let(:inconsistent_interpolations) { i18n.inconsistent_interpolations }++ it 'does not have missing keys' do+ expect(missing_keys).to be_empty,+ "Missing #{missing_keys.leaves.count} i18n keys, run `i18n-tasks missing' to show them"+ end++ it 'does not have unused keys' do+ expect(unused_keys).to be_empty,+ "#{unused_keys.leaves.count} unused i18n keys, run `i18n-tasks unused' to show them"+ end++ it 'files are normalized' do+ non_normalized = i18n.non_normalized_paths+ error_message = "The following files need to be normalized:\n" \+ "#{non_normalized.map { |path| " #{path}" }.join("\n")}\n" \+ "Please run `i18n-tasks normalize' to fix"+ expect(non_normalized).to be_empty, error_message+ end++ it 'does not have inconsistent interpolations' do+ error_message = "#{inconsistent_interpolations.leaves.count} i18n keys have inconsistent interpolations.\n" \+ "Run `i18n-tasks check-consistent-interpolations' to show them"+ expect(inconsistent_interpolations).to be_empty, error_message+ end+enddiff --git a/api/spree_api.gemspec b/api/spree_api.gemspecindex 003d749606..d1f3d0ee8a 100644--- a/api/spree_api.gemspec+++ b/api/spree_api.gemspec@@ -23,7 +23,6 @@ Gem::Specification.new do |s|s.executables = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }s.require_paths = ['lib']- s.add_development_dependency 'i18n-tasks's.add_development_dependency 'jsonapi-rspec's.add_development_dependency 'multi_json's.add_development_dependency 'rswag-specs'diff --git a/core/config/i18n-tasks.yml b/core/config/i18n-tasks.ymlnew file mode 100644index 0000000000..8642d48919--- /dev/null+++ b/core/config/i18n-tasks.yml@@ -0,0 +1,178 @@+# i18n-tasks finds and manages missing and unused translations: https://github.com/glebm/i18n-tasks++# The "main" locale.+base_locale: en+## All available locales are inferred from the data by default. Alternatively, specify them explicitly:+# locales: [es, fr]+## Reporting locale, default: en. Available: en, ru.+# internal_locale: en++# Read and write translations.+data:+ ## Translations are read from the file system. Supported format: YAML, JSON.+ ## Provide a custom adapter:+ # adapter: I18n::Tasks::Data::FileSystem++ # Locale files or `Dir.glob` patterns where translations are read from:+ read:+ ## Default:+ # - config/locales/%{locale}.yml+ ## More files:+ # - config/locales/**/*.%{locale}.yml++ # Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom:+ # `i18n-tasks normalize -p` will force move the keys according to these rules+ write:+ ## For example, write devise and simple form keys to their respective files:+ # - ['{devise, simple_form}.*', 'config/locales/\1.%{locale}.yml']+ ## Catch-all default:+ # - config/locales/%{locale}.yml++ # External locale data (e.g. gems).+ # This data is not considered unused and is never written to.+ external:+ ## Example (replace %#= with %=):+ # - "<%#= %x[bundle info vagrant --path].chomp %>/templates/locales/%{locale}.yml"++ ## Specify the router (see Readme for details). Valid values: conservative_router, pattern_router, or a custom class.+ # router: conservative_router++ yaml:+ write:+ # do not wrap lines at 80 characters+ line_width: -1++ ## Pretty-print JSON:+ # json:+ # write:+ # indent: ' '+ # space: ' '+ # object_nl: "\n"+ # array_nl: "\n"++# Find translate calls+search:+ ## Paths or `Find.find` patterns to search in:+ # paths:+ # - app/++ ## Root directories for relative keys resolution.+ # relative_roots:+ # - app/controllers+ # - app/helpers+ # - app/mailers+ # - app/presenters+ # - app/views++ ## Directories where method names which should not be part of a relative key resolution.+ # By default, if a relative translation is used inside a method, the name of the method will be considered part of the resolved key.+ # Directories listed here will not consider the name of the method part of the resolved key+ #+ # relative_exclude_method_name_paths:+ # -++ ## Files or `File.fnmatch` patterns to exclude from search. Some files are always excluded regardless of this setting:+ ## *.jpg *.jpeg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less+ ## *.yml *.json *.zip *.tar.gz *.swf *.flv *.mp3 *.wav *.flac *.webm *.mp4 *.ogg *.opus *.webp *.map *.xlsx+ exclude:+ - app/assets/images+ - app/assets/fonts+ - app/assets/videos+ - app/assets/builds++ ## Alternatively, the only files or `File.fnmatch patterns` to search in `paths`:+ ## If specified, this settings takes priority over `exclude`, but `exclude` still applies.+ # only: ["*.rb", "*.html.slim"]++ ## If `strict` is `false`, guess usages such as t("categories.#{category}.title"). The default is `true`.+ # strict: true++ ## Allows adding ast_matchers for finding translations using the AST-scanners+ ## The available matchers are:+ ## - RailsModelMatcher+ ## Matches ActiveRecord translations like+ ## User.human_attribute_name(:email) and User.model_name.human+ ## - DefaultI18nSubjectMatcher+ ## Matches ActionMailer's default_i18n_subject method+ ##+ ## To implement your own, please see `I18n::Tasks::Scanners::AstMatchers::BaseMatcher`.+ # ast_matchers:+ # - 'I18n::Tasks::Scanners::AstMatchers::RailsModelMatcher'+ # - 'I18n::Tasks::Scanners::AstMatchers::DefaultI18nSubjectMatcher'++ ## Multiple scanners can be used. Their results are merged.+ ## The options specified above are passed down to each scanner. Per-scanner options can be specified as well.+ ## See this example of a custom scanner: https://github.com/glebm/i18n-tasks/wiki/A-custom-scanner-example++## Translation Services+# translation:+# # Google Translate+# # Get an API key and set billing info at https://code.google.com/apis/console to use Google Translate+# google_translate_api_key: "AbC-dEf5"+# # DeepL Pro Translate+# # Get an API key and subscription at https://www.deepl.com/pro to use DeepL Pro+# deepl_api_key: "48E92789-57A3-466A-9959-1A1A1A1A1A1A"+# # deepl_host: "https://api.deepl.com"+# # deepl_version: "v2"+# # deepl_glossary_ids:+# # - f28106eb-0e06-489e-82c6-8215d6f95089+# # - 2c6415be-1852-4f54-9e1b-d800463496b4+# # add additional options to the DeepL.translate call: https://www.deepl.com/docs-api/translate-text/translate-text/+# deepl_options:+# formality: prefer_less+# # OpenAI+# openai_api_key: "sk-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"+# # openai_model: "gpt-3.5-turbo" # see https://platform.openai.com/docs/models+# # may contain `%{from}` and `%{to}`, which will be replaced by source and target locale codes, respectively (using `Kernel.format`)+# # openai_system_prompt: >-+# # You are a professional translator that translates content from the %{from} locale+# # to the %{to} locale in an i18n locale array.+# #+# # The array has a structured format and contains multiple strings. Your task is to translate+# # each of these strings and create a new array with the translated strings.+# #+# # HTML markups (enclosed in < and > characters) must not be changed under any circumstance.+# # Variables (starting with %%{ and ending with }) must not be changed under any circumstance.+# #+# # Keep in mind the context of all the strings for a more accurate translation.++## Do not consider these keys missing:+# ignore_missing:+# - 'errors.messages.{accepted,blank,invalid,too_short,too_long}'+# - '{devise,simple_form}.*'++## Consider these keys used:+# ignore_unused:+# - 'activerecord.attributes.*'+# - '{devise,kaminari,will_paginate}.*'+# - 'simple_form.{yes,no}'+# - 'simple_form.{placeholders,hints,labels}.*'+# - 'simple_form.{error_notification,required}.:'++## Exclude these keys from the `i18n-tasks eq-base' report:+# ignore_eq_base:+# all:+# - common.ok+# fr,es:+# - common.brand++## Exclude these keys from the `i18n-tasks check-consistent-interpolations` report:+# ignore_inconsistent_interpolations:+# - 'activerecord.attributes.*'++## Ignore these keys completely:+# ignore:+# - kaminari.*++## Sometimes, it isn't possible for i18n-tasks to match the key correctly,+## e.g. in case of a relative key defined in a helper method.+## In these cases you can use the built-in PatternMapper to map patterns to keys, e.g.:+#+# <%# I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',+# only: %w(*.html.haml *.html.slim),+# patterns: [['= title\b', '.page_title']] %>+#+# The PatternMapper can also match key literals via a special %{key} interpolation, e.g.:+#+# <%# I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',+# patterns: [['\bSpree\.t[( ]\s*%{key}', 'spree.%{key}']] %>diff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex ad5acf81dd..eb3a81f97b 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -1,4 +1,8 @@+---en:+ action_text:+ video_embed:+ not_found: Can't embed a video using the provided URLactivemodel:errors:messages:@@ -6,22 +10,22 @@ en:models:spree/fulfilment_changer:attributes:+ current_shipment:+ can_not_have_backordered_inventory_units: has backordered inventory units+ has_already_been_shipped: has already been shippeddesired_shipment:can_not_transfer_within_same_shipment: can not be same as current shipmenthas_not_enough_stock_at_desired_location: has not enough stock in desired stock location- current_shipment:- has_already_been_shipped: has already been shipped- can_not_have_backordered_inventory_units: has backordered inventory unitsactiverecord:attributes:spree/address:- label: Address nameaddress1: Addressaddress2: Address (contd.)city: Citycompany: Companycountry: Countryfirstname: First Name+ label: Address namelastname: Last Namephone: Phonestate: State@@ -42,26 +46,28 @@ en:base: ''cc_type: Typemonth: Month+ name: Namenumber: Numberverification_value: Verification Valueyear: Year- name: Namespree/inventory_unit:state: Statespree/line_item:price: Pricequantity: Quantityspree/option_type:+ filterable: Filterablename: Namepresentation: Presentation- filterable: Filterablespree/order:checkout_complete: Checkout Completecompleted_at: Completed At+ considered_risky: Riskycoupon_code: Coupon Codecreated_at: Order Dateemail: Emailip_address: IP Address+ item_count: Itemsitem_total: Item Totalnumber: Numberpayment_state: Payment State@@ -69,8 +75,6 @@ en:special_instructions: Special Instructionsstate: Statetotal: Total- considered_risky: Risky- item_count: Itemsspree/order/bill_address:address1: Billing address streetcity: Billing address city@@ -94,18 +98,18 @@ en:name: Namespree/product:available_on: Available On- make_active_at: Make Active At- discontinue_on: Discontinue Oncost_currency: Cost Currencycost_price: Cost Pricedescription: Description+ discontinue_on: Discontinue On+ less_than: Less than+ make_active_at: Make Active Atmaster_price: Master Price+ more_than: More thanname: Nameon_hand: On Handshipping_category: Shipping Categorytax_category: Tax Category- less_than: Less than- more_than: More thanspree/promotion:advertise: Advertisecode: Code@@ -115,12 +119,12 @@ en:generate_code: Generate coupon codename: Namepath: Path+ promotion_category: Promotion Categorystarts_at: Starts Atusage_limit: Usage Limit- promotion_category: Promotion Categoryspree/promotion_category:- name: Namecode: Code+ name: Namespree/property:name: Namepresentation: Presentation@@ -137,20 +141,20 @@ en:name: Namespree/state_change:state_changes: State changes- type: Typestate_from: State fromstate_to: State to- user: Usertimestamp: Timestamp+ type: Typeupdated: Updated+ user: Userspree/store:- url: Site URL+ mail_from_address: Mail From Addressmeta_description: Meta Descriptionmeta_keywords: Meta Keywords+ name: Site Nameseo_robots: SEO Robotsseo_title: SEO Title- name: Site Name- mail_from_address: Mail From Address+ url: Site URLspree/store_credit:amount_used: Amount usedspree/store_credit_category:@@ -181,11 +185,119 @@ en:sku: SKUweight: Weightwidth: Width+ spree/wished_item:+ variant: ''spree/zone:description: Descriptionname: Name- spree/wished_item:- variant: ""+ errors:+ messages:+ blank: can't be blank+ models:+ spree/calculator/tiered_flat_rate:+ attributes:+ base:+ keys_should_be_positive_number: Tier keys should all be numbers larger than 0+ preferred_tiers:+ should_be_hash: should be a hash+ spree/calculator/tiered_percent:+ attributes:+ base:+ keys_should_be_positive_number: Tier keys should all be numbers larger than 0+ values_should_be_percent: Tier values should all be percentages between 0% and 100%+ preferred_tiers:+ should_be_hash: should be a hash+ spree/classification:+ attributes:+ taxon_id:+ already_linked: is already linked to this product+ spree/credit_card:+ attributes:+ base:+ card_expired: Card has expired+ expiry_invalid: Card expiration is invalid+ spree/image:+ attributes:+ attachment:+ attachment_must_be_present: must be present+ not_allowed_content_type: has not allowed content type+ spree/legacy_user:+ attributes:+ bill_address_id:+ belongs_to_other_user: belongs to other user+ deprecated_in_completed_order: deprecated in completed order+ ship_address_id:+ belongs_to_other_user: belongs to other user+ deprecated_in_completed_order: deprecated in completed order+ spree/line_item:+ attributes:+ currency:+ must_match_order_currency: Must match order currency+ spree/product:+ attributes:+ base:+ cannot_destroy_if_attached_to_line_items: Cannot delete Products that are added to placed Orders. In such cases, please discontinue them.+ discontinue_on:+ invalid_date_range: must be later than available date+ spree/promotion:+ attributes:+ expires_at:+ invalid_date_range: must be later than start date+ spree/refund:+ attributes:+ amount:+ greater_than_allowed: is greater than the allowed amount.+ spree/reimbursement:+ attributes:+ base:+ return_items_order_id_does_not_match: One or more of the return items specified do not belong to the same order as the reimbursement.+ spree/return_item:+ attributes:+ inventory_unit:+ other_completed_return_item_exists: "%{inventory_unit_id} has already been taken by return item %{return_item_id}"+ reimbursement:+ cannot_be_associated_unless_accepted: cannot be associated to a return item that is not accepted.+ spree/shipping_method:+ attributes:+ base:+ required_shipping_category: You must select at least one shipping category+ spree/store:+ attributes:+ base:+ cannot_destroy_only_store: Cannot destroy the only Store.+ spree/store_credit:+ attributes:+ amount_authorized:+ exceeds_total_credits: Exceeds total credits.+ amount_used:+ cannot_be_greater_than_amount: Cannot be greater than amount.+ greater_than_zero_restrict_delete: is greater than zero. Can not delete store credit.+ spree/store_credit_category:+ attributes:+ base:+ cannot_destroy_if_used_in_store_credit: Cannot delete store credit categories once they are used in store credit.+ spree/taxon_image:+ attributes:+ attachment:+ not_allowed_content_type: has not allowed content type+ spree/user:+ attributes:+ bill_address_id:+ belongs_to_other_user: belongs to other user+ deprecated_in_completed_order: deprecated in completed order+ ship_address_id:+ belongs_to_other_user: belongs to other user+ deprecated_in_completed_order: deprecated in completed order+ spree/variant:+ attributes:+ base:+ cannot_destroy_if_attached_to_line_items: Cannot delete Variants that are added to placed Orders. In such cases, please discontinue them.+ must_supply_price_for_variant_or_master: Must supply price for variant or master price for product.+ no_master_variant_found_to_infer_price: No master variant found to infer price+ spree/wished_item:+ attributes:+ variant:+ taken: You already added this item to your wishlistmodels:spree/address:one: Address@@ -274,12 +386,12 @@ en:spree/state_change:one: State Changeother: State Changes- spree/stock_movement:- one: Stock Movement- other: Stock Movementsspree/stock_location:one: Stock Locationother: Stock Locations+ spree/stock_movement:+ one: Stock Movement+ other: Stock Movementsspree/stock_transfer:one: Stock Transferother: Stock Transfers@@ -313,114 +425,6 @@ en:spree/zone:one: Zoneother: Zones- errors:- messages:- blank: can't be blank- models:- spree/calculator/tiered_flat_rate:- attributes:- base:- keys_should_be_positive_number: "Tier keys should all be numbers larger than 0"- preferred_tiers:- should_be_hash: "should be a hash"- spree/calculator/tiered_percent:- attributes:- base:- keys_should_be_positive_number: "Tier keys should all be numbers larger than 0"- values_should_be_percent: "Tier values should all be percentages between 0% and 100%"- preferred_tiers:- should_be_hash: "should be a hash"- spree/classification:- attributes:- taxon_id:- already_linked: "is already linked to this product"- spree/credit_card:- attributes:- base:- card_expired: "Card has expired"- expiry_invalid: "Card expiration is invalid"- spree/legacy_user:- attributes:- bill_address_id:- belongs_to_other_user: belongs to other user- deprecated_in_completed_order: deprecated in completed order- ship_address_id:- belongs_to_other_user: belongs to other user- deprecated_in_completed_order: deprecated in completed order- spree/user:- attributes:- bill_address_id:- belongs_to_other_user: belongs to other user- deprecated_in_completed_order: deprecated in completed order- ship_address_id:- belongs_to_other_user: belongs to other user- deprecated_in_completed_order: deprecated in completed order- spree/line_item:- attributes:- currency:- must_match_order_currency: "Must match order currency"- spree/promotion:- attributes:- expires_at:- invalid_date_range: must be later than start date- spree/product:- attributes:- discontinue_on:- invalid_date_range: must be later than available date- base:- cannot_destroy_if_attached_to_line_items: Cannot delete Products that are added to placed Orders. In such cases, please discontinue them.- spree/refund:- attributes:- amount:- greater_than_allowed: is greater than the allowed amount.- spree/reimbursement:- attributes:- base:- return_items_order_id_does_not_match: One or more of the return items specified do not belong to the same order as the reimbursement.- spree/return_item:- attributes:- reimbursement:- cannot_be_associated_unless_accepted: cannot be associated to a return item that is not accepted.- inventory_unit:- other_completed_return_item_exists: "%{inventory_unit_id} has already been taken by return item %{return_item_id}"- spree/shipping_method:- attributes:- base:- required_shipping_category: "You must select at least one shipping category"- spree/store:- attributes:- base:- cannot_destroy_only_store: Cannot destroy the only Store.- spree/store_credit:- attributes:- amount_used:- cannot_be_greater_than_amount: Cannot be greater than amount.- greater_than_zero_restrict_delete: is greater than zero. Can not delete store credit.- amount_authorized:- exceeds_total_credits: Exceeds total credits.- spree/store_credit_category:- attributes:- base:- cannot_destroy_if_used_in_store_credit: Cannot delete store credit categories once they are used in store credit.- spree/wished_item:- attributes:- variant:- taken: "You already added this item to your wishlist"- spree/variant:- attributes:- base:- cannot_destroy_if_attached_to_line_items: Cannot delete Variants that are added to placed Orders. In such cases, please discontinue them.- no_master_variant_found_to_infer_price: No master variant found to infer price- must_supply_price_for_variant_or_master: Must supply price for variant or master price for product.- spree/image:- attributes:- attachment:- not_allowed_content_type: has not allowed content type- attachment_must_be_present: must be present- spree/taxon_image:- attributes:- attachment:- not_allowed_content_type: has not allowed content typeaddress_book:save: Savesuccessfully_created: New address has been successfully created@@ -462,123 +466,131 @@ en:user_sessions:signed_in: Signed in successfully.signed_out: Signed out successfully.-errors:messages:already_confirmed: was already confirmed+ not_a_number: not a numbernot_found: not foundnot_locked: was not lockednot_saved:- one: ! '1 error prohibited this %{resource} from being saved:'- other: ! '%{count} errors prohibited this %{resource} from being saved:'-+ one: '1 error prohibited this %{resource} from being saved:'+ other: "%{count} errors prohibited this %{resource} from being saved:"number:+ currency:+ format:+ separator: "."percentage:format:precision: 1-pagination:first: "«"last: "»"- previous: "‹"next: "›"+ previous: "‹"truncate: "…"-spree:abbreviation: Abbreviationaccept: Accept- acceptance_status: Acceptance statusacceptance_errors: Acceptance errors+ acceptance_status: Acceptance statusaccepted: Accepted+ accepts_email_marketing: Accepts email marketingaccount: Accountaccount_info: Account info+ account_members: Teamaccount_updated: Account updatedaction: Actionactions:+ approve: Approvecancel: Cancel+ confirm: Confirm+ connect: Connectcontinue: Continuecreate: Create- approve: Approve+ destroy: Delete+ discard: Discard+ disconnect: Disconnectedit: Edit- confirm: Confirmlist: Listlisting: Listingnew: New- connect: Connect- discard: Discard- destroy: Delete- disconnect: Disconnect+ publish: Publish+ receive: Mark as receivedrefund: Refund- save: Save- update: Updatereject: Reject- receive: Mark as receivedresolve: Mark as resolved+ save: Save+ select_file: Select filesend_invitation: Send invitation+ update: Updateactivate: Activateactive: Activeadd: Add- add_new_credit_card: Add a new cardadd_action_of_type: Add action of typeadd_country: Add Countryadd_coupon_code: Add Coupon Codeadd_new_address: Add new address+ add_new_credit_card: Add a new cardadd_new_header: Add New Header+ add_new_page: Add new page+ add_new_store: Add New Storeadd_new_style: Add New Styleadd_one: Add Oneadd_option_value: Add Option Valueadd_product: Add Product- add_products: Add Productsadd_product_properties: Add Product Properties+ add_products: Add Productsadd_rule_of_type: Add rule of type+ add_section: Add section+ add_selected_products: Add selected products+ add_selected_variant: Add selected variantadd_state: Add Stateadd_stock: Add Stock- add_to_cart: Add To Cart- add_variant: Add Variantadd_store: New Storeadd_store_credit: Add Store Credit+ add_to_cart: Add To Cart+ add_variant: Add Variantadded_to_cart: Added to cart successfully!additional_item: Additional Itemaddress: Addressaddress1: Addressaddress2: Address (contd.)- addresses: Addressesaddress_action_popup:delete_button: yes, deletedelete_text: Do you really want <br /> to delete this address?delete_title: Are you sure?address_book:- other_address: "Other address"- add_new_shipping_address: "Add new address"- label: Address Name+ add_new_shipping_address: Add new addressaddress_name_label: Address Nameaddress_name_placeholder: Give this address a unique name (Work, Home, etc.)- new_address: "New Address"- edit_address: "Edit Address"+ addresses: Addresses+ edit_address: Edit Address+ label: Address Name+ new_address: New Address+ no_shipping_addresses_on_file: No addresses on file+ other_address: Other addressremove_address: Remove Address- no_shipping_addresses_on_file: "No addresses on file"- addresses: "Addresses"- successfully_created: "Address has been successfully created."- successfully_removed: "Address has been successfully removed."- successfully_saved: "Saved successfully"- unsuccessfully_saved: "There was an error while trying to save your address."- successfully_updated: "Updated successfully"- unsuccessfully_updated: "There was an update while trying to update your address."- save: "Save"+ save: Save+ successfully_created: Address has been successfully created.+ successfully_removed: Address has been successfully removed.+ successfully_saved: Saved successfully+ successfully_updated: Updated successfully+ unsuccessfully_saved: There was an error while trying to save your address.+ unsuccessfully_updated: There was an update while trying to update your address.+ addresses: Addressesadjustable: Adjustableadjustment: Adjustmentadjustment_amount: Amountadjustment_labels:tax_rates:- including_tax: '%{name}%{amount} (Included in Price)'- excluding_tax: '%{name}%{amount}'+ excluding_tax: "%{name}%{amount}"+ including_tax: "%{name}%{amount} (Included in Price)"adjustment_successfully_closed: Adjustment has been successfully closed!adjustment_successfully_opened: Adjustment has been successfully opened!adjustment_total: Adjustment Totaladjustments: Adjustments- administration: Administration- add_new_store: Add New Storeadjustments_deleted: Adjustments Deleted+ administration: Administrationadvertise: Advertiseagree_to_privacy_policy: Agree to Privacy Policyagree_to_terms_of_service: Agree to Terms of Service@@ -587,41 +599,52 @@ en:all_adjustments_opened: All adjustments successfully opened!all_departments: All departmentsall_items_have_been_returned: All items have been returned+ all_products: All productsall_rights_reserved: All rights reserved+ all_time: All timealready_have_account: Already have an account?alt_text: Alternative Textalternative_phone: Alternative Phoneamount: Amount+ analytics: Analyticsand: and+ api_keys: API keysapply_only_on_full_priced_items: Apply only on full priced itemsapprove: approve- approver: Approverapproved_at: Approved at+ approver: Approverare_you_sure: Are you sure?are_you_sure_delete: Are you sure you want to delete this record?associated_adjustment_closed: The associated adjustment is closed, and will not be recalculated. Do you want to open it?- at_symbol: '@'+ at_symbol: "@"+ audit_log: Audit Log+ author: Authorauthorization_failure: Authorization Failureauthorized: Authorizedauto_capture: Auto Capture+ automatic_taxon_names:+ new_arrivals: New arrivals+ on_sale: On saleavailability: availability- available_on: Available On- make_active_at: Make Active Atavailable: Available+ available_on: Available Onaverage_order_value: Average Order Valueavs_response: AVS Responseback: Backback_end: Backend- backordered: Backordered- back_to_resource_list: 'Back To %{resource} List'back_to_payment: Back To Payment+ back_to_resource_list: Back To %{resource} Listback_to_rma_reason_list: Back To RMA Reason Listback_to_store: Back to Storeback_to_users_list: Back To Users Listbackorderable: Backorderablebackorderable_default: Backorderable default+ backordered: Backordered+ backordered_confirm_info: Selected item is backordered so expect delays. Are you sure you want to order it?+ backordered_info: Backorderedbackorders_allowed: backorders allowedbalance_due: Balance Due+ barcode: Barcodebase_amount: Base Amountbase_percent: Base Percentbasic_information: Basic Information@@ -629,6 +652,9 @@ en:billing: Billingbilling_address: Billing Addressblog: Blog+ blogs_posts: Blogs posts+ body_tag_end: Body tag end+ body_tag_start: Body tag startboth: Bothbreadcrumbs: Breadcrumbscalculated_reimbursements: Calculated Reimbursements@@ -636,16 +662,16 @@ en:calculator_settings_warning: If you are changing the calculator type, you must save first before you can edit the calculator settingscall_us_now: 'Call us now: 'cancel: cancel+ cancel_order: Cancel ordercanceled: Canceled- canceler: Cancelercanceled_at: Canceled at- cancel_order: Cancel order+ canceler: Cancelercannot_be_destroyed: Order cannot be destroyed.- cannot_empty: Cannot empty order.- cannot_empty_completed_order: Order has already been processed so it cannot be emptied- cannot_create_payment_without_payment_methods: You cannot create a payment for an order without any payment methods defined.cannot_create_customer_returns: Cannot create customer returns as this order has no shipped units.+ cannot_create_payment_without_payment_methods: You cannot create a payment for an order without any payment methods defined.cannot_create_returns: Cannot create returns as this order has no shipped units.+ cannot_empty: Cannot empty order.+ cannot_empty_completed_order: Order has already been processed so it cannot be emptiedcannot_perform_operation: Cannot perform requested operationcannot_return_more_than_bought_quantity: Cannot return more than bought quantity.cannot_set_shipping_method_without_address: Cannot set shipping method until customer details are provided.@@ -658,30 +684,32 @@ en:card_type_is: Card type iscart: Cartcart_line_item:- discontinued: '%{li_name} was removed because it was discontinued'- out_of_stock: '%{li_name} was removed because it was sold out'+ discontinued: "%{li_name} was removed because it was discontinued"+ out_of_stock: "%{li_name} was removed because it was sold out"cart_page:add_promo_code: ADD PROMO CODEchange_quantity: Change quantitycheckout: checkout- empty_info: 'Your cart is empty.'+ empty_info: Your cart is empty.header: Your shopping cartproduct: productquantity: quantityremove_from_cart: Remove from carttitle: Shopping Cart- cart_subtotal:- one: 'Subtotal (1 item)'- other: 'Subtotal (%{count} items)'cart_state_changed: Cart changed+ cart_subtotal:+ one: Subtotal (1 item)+ other: Subtotal (%{count} items)categories: Categories+ categorization: Categorizationcategory: Categorychanges_published: Changes published!channel: Channelcharged: Chargedcheckout: Checkout+ checkout_message: Checkout messagechoose_a_customer: Choose a customer- choose_a_taxon_to_sort_products_for: "Choose a taxon to sort products for"+ choose_a_taxon_to_sort_products_for: Choose a taxon to sort products forchoose_currency: Choose Currencychoose_dashboard_locale: Choose Dashboard Localechoose_location: Choose location@@ -695,8 +723,10 @@ en:close_all_adjustments: Close All Adjustmentscode: Codecompany: Company+ compare_at_amount: Compare at amountcompare_at_price: Compare at pricecomplete: complete+ conditions: Conditionsconfiguration: Configurationconfigurations: Configurationsconfirm: Confirm@@ -705,10 +735,15 @@ en:contact_information: Contact informationcontact_phone: Contact phonecontact_us: Contact us+ container_alignment: Container alignment+ content: Contentcontinue: Continuecontinue_as_guest: Continue as a guest+ continue_selling_when_out_of_stock: Continue selling when out of stockcontinue_shopping: Continue shopping+ copy_id: Copycopy_payment_link: Copy payment link+ copy_to_clipboard: Copy to clipboardcost_currency: Cost Currencycost_price: Cost Pricecould_not_create_customer_return: Could not create customer return@@ -727,9 +762,9 @@ en:label: Choose must be shipped to this countrycoupon: Couponcoupon_code: Coupon code- coupon_code_apply: Applycoupon_code_already_applied: The coupon code has already been applied to this ordercoupon_code_applied: The coupon code was successfully applied to your order.+ coupon_code_apply: Applycoupon_code_better_exists: The previously applied coupon code results in a better dealcoupon_code_expired: The coupon code is expiredcoupon_code_max_usage: Coupon code usage limit exceeded@@ -740,44 +775,48 @@ en:coupon_code_used: The coupon code you entered has already been used. Please try again.create: Createcreate_a_new_account: Create a new account+ create_customer: Create customercreate_new: Create newcreate_new_order: Create new order+ create_new_team: Create new teamcreate_reimbursement: Create reimbursementcreated_at: Created Atcreated_by: Created Bycredit: Credit+ credit_allowed: Credit allowedcredit_card: Credit Cardcredit_card_remove_confirmation: Are you sure you want to delete the credit card?credit_cards: Credit Cardscredit_owed: Credit Owedcredited: Creditedcredits: Credits- currency: Currencycurrencies: Currencies+ currency: Currencycurrency_settings: Currency Settingscurrent: Current- current_promotion_usage: ! 'current usage: %{count}'+ current_promotion_usage: 'current usage: %{count}'+ custom_code: Custom code+ custom_font_code: Custom font codecustomer: Customer- customers: Customerscustomer_details: Customer Detailscustomer_details_updated: Customer Details Updatedcustomer_return: Customer Returncustomer_returns: Customer Returnscustomer_search: Customer Searchcustomer_support_email: Customer Support Email- new_order_notifications_email: New Order Notifications Email+ customers: Customerscut: Cutcvv: CVV- no_cc_type: N/Acvv_response: CVV Responsedate: Datedate_completed: Date Completeddate_picker:- # FlatPickr human friendly formattingfpr_human_friendly_date_format: M j, Yfpr_human_friendly_date_time_format: M j, Y at H:idate_range: Date Range+ days_ago: Days agodefault: Default+ default_country: Default Countrydefault_country_cannot_be_deleted: Default country cannot be deleteddefault_currency: Default currencydefault_post_categories:@@ -785,39 +824,56 @@ en:news: Newsresources: Resourcesdefault_refund_amount: Default Refund Amount+ default_stock_location_name: Shop locationdefault_tax: Default Taxdefault_tax_zone: Default Tax Zonedefault_theme_name: Defaultdefault_wishlist_name: Wishlistdelete: Delete- deleted: Deleteddelete_from_taxon: Delete From Taxon- digital:- digital_delivery: Digital Delivery- dimension_units:- millimeter: Millimeter (mm)- centimeter: Centimeter (cm)- inch: Inch (in)- foot: Foot (ft)- discontinued_variants_present: Some line items in this order have products that are no longer available.+ delete_selected: Delete selected+ deleted: Deleteddelivery: Deliverydelivery_information: Delivery Informationdepth: Depth- details: Detailsdescription: Descriptiondestination: Destinationdestroy: Destroy- discount_amount: Discount Amount+ details: Details+ developers: Developers+ digital:+ digital_delivery: Digital Delivery+ dimension_units:+ centimeter: Centimeter (cm)+ foot: Foot (ft)+ inch: Inch (in)+ millimeter: Millimeter (mm)discontinue_on: Discontinue Ondiscontinued: Discontinued+ discontinued_variants_present: Some line items in this order have products that are no longer available.+ discount: Discount+ discount_amount: Discount Amount+ discounts: Discountsdismiss_banner: No. Thanks! I'm not interested, do not display this message againdisplay: Display- display_delivery_range: "Delivery in %{delivery_range} business days"+ display_delivery_range: Delivery in %{delivery_range} business days+ display_on: Display on+ display_settings: Display settings+ do_not_import: Do not importdoesnt_track_inventory: It doesn't track inventory+ domain: Domain+ domains: Domains+ done: Donedont_have_account: No account?+ download: Download+ draft: Draftdraft_mode: Draft Mode+ draft_orders: Draft orders+ duplicate: Duplicate+ duplicating: Duplicatingedit: Edit- editing_resource: 'Editing %{resource}'+ edit_refund: Edit refund+ editing_resource: Editing %{resource}editing_rma_reason: Editing RMA Reasonediting_user: Edit Your accounteligibility_errors:@@ -837,31 +893,35 @@ en:not_first_order: This coupon code can only be applied to your first order.wrong_country: This coupon code is not eligible in your countryemail: Email+ email_marketing: Email marketing+ emails: Emailsempty: Emptyempty_cart: Empty Cartenable_mail_delivery: Enable Mail Deliveryend: End- ends_at: Ends atending_at: Ending atending_in: Ending in+ ends_at: Ends aterror: error+ error_user_destroy_with_orders: User associated with orders cannot be destroyed+ error_user_does_not_have_any_store_credits: User does not have any Store Credits availableerrors:- messages:- store_association_can_not_be_changed: The store association can not be changed- store_is_already_set: Store is already set+ messages:blank: can't be blank+ cannot_remove_icon: Cannot remove imagecould_not_create_taxon: Could not create taxonno_shipping_methods_available: No shipping methods available for selected location, please change your address and try again.- cannot_remove_icon: Cannot remove image+ store_association_can_not_be_changed: The store association can not be changed+ store_is_already_set: Store is already setservices:get_shipping_rates:- no_shipping_address: To generate Shipping Rates Order needs to have a Shipping Addressno_line_items: To generate Shipping Rates you need to add some Line Items to Order+ no_shipping_address: To generate Shipping Rates Order needs to have a Shipping Addresserrors_prohibited_this_record_from_being_saved:one: 1 error prohibited this record from being saved- other: ! '%{count} errors prohibited this record from being saved'- error_user_destroy_with_orders: User associated with orders cannot be destroyed- error_user_does_not_have_any_store_credits: 'User does not have any Store Credits available'+ other: "%{count} errors prohibited this record from being saved"+ estimated_delivery_time: Estimated delivery time+ estimated_transit_business_days: Estimated transit business daysevent: Eventevents:spree:@@ -878,42 +938,50 @@ en:signup: User signupexceptions:count_on_hand_setter: Cannot set count_on_hand manually, as it is set automatically by the recalculate_count_on_hand callback. Please use `update_column(:count_on_hand, value)` instead.+ excerpt: Excerptexchange_for: Exchange for- expedited_exchanges_warning: "Any specified exchanges will ship to the customer immediately upon saving. The customer will be charged the full amount of the item if they do not return the original item within %{days_window} days."excl: excl.+ existing_address: Existing address+ existing_shipments: Existing shipments+ expedited_exchanges_warning: Any specified exchanges will ship to the customer immediately upon saving. The customer will be charged the full amount of the item if they do not return the original item within %{days_window} days.expiration: Expirationexpiration_date: Expiration Dateexport: Exportexport_mailer:- greeting: Hi %{user_name},- thanks: Thank you,export_done:- subject: 'Your export %{export_number} was successfully processed!'message: Good work, your export is ready! Please use the link below to download it.+ subject: Your export %{export_number} was successfully processed!+ greeting: Hi %{user_name},+ thanks: Thank you,extension: Extensionextensions_directory: Extensions Directory- existing_address: Existing address- existing_shipments: Existing shipmentsfacebook: Facebookfailed_payment_attempts: Failed Payment Attempts- favicon: 'Favicon'- favicon_upload_info: "File format: PNG or ICO. File resolution: up to 256x256. File size: up to 1MB"+ favicon: Favicon+ favicon_upload_info: 'File format: PNG or ICO. File resolution: up to 256x256. File size: up to 1MB'+ featured_image: Featured image+ featured_taxon: Featured taxon+ field: Fieldfilename: Filenamefill_in_customer_info: Please fill in customer infofilter: Filter- filterable: Filterablefilter_results: Filter Results+ filterable: Filterable+ filtered_records: Filtered recordsfinalize: Finalize- find_a_taxon: Find a Taxonfinalized: Finalized+ find_a_taxon: Find a Taxonfirst_item: First Itemfirst_name: First Name- firstname: First Namefirst_name_begins_with: First Name Begins With+ firstname: First Nameflat_percent: Flat Percentflat_rate_per_order: Flat Rateflexible_rate: Flexible Ratefollow_us: Follow us+ font_family: Font family+ font_size_scale: Font size scale+ fonts: Fontsfooter: Footerforgot_password: Forgot password?free: Free@@ -926,9 +994,11 @@ en:gateway: Gatewaygateway_error: Gateway Errorgeneral: General+ general_information: General informationgeneral_settings: General Settingsgenerate_code: Generate coupon codeget_back_to_the: Get back to the+ gift_cards: Gift cardsgo_to_category: Go to categorygo_to_facebook: Go to facebookgo_to_homepage: Go to Home Page@@ -937,21 +1007,24 @@ en:guest_checkout: Guest Checkoutguest_user_account: Checkout as a Guesthas_no_shipped_units: has no shipped units+ head_tag: Head tagheader_banner: Header banner+ header_font_family: Header font family+ header_font_size_scale: Header font size scaleheight: Height+ help_center: Help Centerhide_from_subcategories_nav: Hide from subcategories navigationhome: Homehome_page: homepage- help_center: Help Centeri18n:available_locales: Available Locales- fields: Fields- language: Languagecountry: Countrydefault_country: Default Country+ fields: Fields+ language: Languagelocalization_settings: Localization Settings- only_incomplete: Only incompleteonly_complete: Only complete+ only_incomplete: Only incompleteselect_locale: Select localeshow_only: Show onlysupported_locales: Supported Locales@@ -959,20 +1032,23 @@ en:translations: Translationsicon: Iconimage: Image- images: Imagesimage_alt_text: Add Alt text to your image- implement_eligible_for_return: "Must implement #eligible_for_return? for your EligibilityValidator."- implement_requires_manual_intervention: "Must implement #requires_manual_intervention? for your EligibilityValidator."+ images: Images+ implement_eligible_for_return: 'Must implement #eligible_for_return? for your EligibilityValidator.'+ implement_requires_manual_intervention: 'Must implement #requires_manual_intervention? for your EligibilityValidator.'+ import_payment_methods_from: Import payment methods from+ import_products_from: Import products fromin_stock: In Stockinactive: Inactiveincl: incl.included_in_price: Included in Priceincluded_price_validation: cannot be selected unless you have set a Default Tax Zoneincomplete: Incomplete- info_product_has_multiple_skus: "This product has %{count} variants:"+ index_in_search_engines: Index in search enginesinfo_number_of_skus_not_shown:- one: "and one other"- other: "and %{count} others"+ one: and one other+ other: and %{count} others+ info_product_has_multiple_skus: 'This product has %{count} variants:'instagram: Instagraminstructions_to_reset_password: Please enter your email on the form belowinsufficient_stock: Insufficient stock available, only %{on_hand} remaining@@ -996,6 +1072,7 @@ en:iso: ISO Alpha-2iso3: ISO Alpha-3iso_name: ISO Name+ issue_gift_card: Issue Gift Cardissued_on: Issued Onitem: Itemitem_description: Item Description@@ -1007,30 +1084,31 @@ en:lt: less thanlte: less than or equal toitems_cannot_be_shipped: We are unable to calculate shipping rates for the selected items.- products_cannot_be_shipped: We cannot ship %{product_names} to your current location at the moment. Please change your shipping address or remove %{product_names} from your cart.items_in_rmas: Items in Return Authorizations- items_to_be_reimbursed: Items to be reimburseditems_reimbursed: Items reimbursed+ items_to_be_reimbursed: Items to be reimbursedjoin_slack: Join Slack+ kind: Kindlanguage: Languagelast_name: Last Name- lastname: Last Namelast_name_begins_with: Last Name Begins With+ lastname: Last Namelearn_more: Learn Morelifetime_stats: Lifetime Statslimit_usage_to: Limit usage toline_item: Line Item- line_item_adjustments: "Line item adjustments"+ line_item_adjustments: Line item adjustments+ line_items: Line itemslist: List+ live: Liveloading: Loadingloading_tree: Loading tree. Please wait…locale_changed: Locale Changedlocation: Locationlock: Lock- log_entries: "Log Entries"+ log_entries: Log Entrieslog_in: Log inlog_in_to_continue: Log in to continue- logs: "Logs"logged_in_as: Logged in aslogged_in_successfully: Logged in successfullylogged_out: You have been logged out.@@ -1041,55 +1119,70 @@ en:logo: Logologo_alt: Brand logologout: Logout+ logs: Logslook_for_similar_items: Look for similar items- make_refund: Make refund- make_sure_the_above_reimbursement_amount_is_correct: Make sure the above reimbursement amount is correctmail_from_address: Mail from addressmailer_logo: Mailer logo (JPG or PNG images only)+ make_active_at: Make Active At+ make_refund: Make refund+ make_sure_the_above_reimbursement_amount_is_correct: Make sure the above reimbursement amount is correctmanage_promotion_categories: Manage Promotion Categories- manual_intervention_required: Manual intervention requiredmanage_variants: Manage Variants+ manual_intervention_required: Manual intervention required+ mark_as_default: Mark as defaultmaster: Mastermaster_price: Master Pricemaster_sku: Master SKUmatch_choices:all: Allnone: None- max: 'Max'+ max: Maxmax_items: Max Items+ media: Mediamemo: Memometa_description: Meta Descriptionmeta_keywords: Meta Keywordsmeta_title: Meta Titlemetadata: Metadata- mutable: Mutable- must_have_one_store: The resource must belong to a store.- min: 'Min'+ min: Minminimal_amount: Minimal Amount- missing_return_authorization: ! 'Missing Return Authorization for %{item_name}.'+ missing_return_authorization: Missing Return Authorization for %{item_name}.month: Monthmore: More+ more_actions: More actionsmove: Move+ move_down: Move downmove_stock_between_locations: Move Stock Between Locations+ move_up: Move upmove_variant_to: Move variant to+ must_have_one_store: The resource must belong to a store.+ mutable: Mutablemy_account: My Accountmy_orders: My Ordersname: Namename_on_card: Name on cardname_or_sku: Name or SKU (enter at least first 3 characters of product name)+ navigation: Navigationnew: Newnew_adjustment: New Adjustment- new_shipping_address: New Bhipping Address+ new_billing_address: New billing address+ new_country: New Countrynew_customer: Create new accountnew_customer_return: New Customer Return- new_country: New Country+ new_domain: New domainnew_image: New Imagenew_line_item: Add line item+ new_market: New market+ new_nested_taxon: New nested taxonnew_option_type: New Option Typenew_order: New Ordernew_order_completed: New Order Completed+ new_order_notifications_email: New Order Notifications Email+ new_page: New Pagenew_payment: New Paymentnew_payment_method: New Payment Method+ new_post: New Post+ new_post_category: New Post Categorynew_product: New Productnew_promotion: New Promotionnew_promotion_category: New Promotion Category@@ -1098,17 +1191,18 @@ en:new_refund: New Refundnew_refund_reason: New Refund Reasonnew_reimbursement_type: New Reimbursement Type- new_rma_reason: New RMA Reasonnew_return_authorization: New Return Authorization+ new_rma_reason: New RMA Reasonnew_role: New Role+ new_shipment_at_location: New shipment at locationnew_shipping_address: New Shipping Addressnew_shipping_category: New Shipping Categorynew_shipping_method: New Shipping Method- new_shipment_at_location: New shipment at locationnew_state: New Statenew_stock_location: New Stock Locationnew_stock_movement: New Stock Movementnew_stock_transfer: New Stock Transfer+ new_store: New Storenew_store_credit: New Store Creditnew_store_credit_category: New Store Credit Categorynew_tax_category: New Tax Category@@ -1123,43 +1217,48 @@ en:no_actions_added: No actions addedno_address_given: No address givenno_available_date_set: No available date set+ no_billing_address_available: No billing address available+ no_cc_type: N/Ano_country: No country setno_email_provided: No email provided+ no_limits_zone: No Limitsno_payment_found: No payment foundno_payment_provider_settings_message: This payment provider has no custom settings availableno_pending_payments: No pending paymentsno_product_available:for_this_quantity: Sorry, it looks like some products are not available in selected quantity.oops: Oops!+ no_products_added: No products addedno_products_found: No products found+ no_resource_found: No %{resource} foundno_results: No results- no_rules_added: No rules added- no_resource_found: 'No %{resource} found'no_returns_found: No returns found+ no_rules_added: No rules added+ no_saved_cards: No saved cards+ no_shipping_address_available: No shipping address availableno_shipping_method_selected: No shipping method selected.no_state_changes: No state changes yet.no_tracking_present: No tracking details provided.- not_provided: Not provided- not_risky: Not risky- user_not_found: User not foundnone: Nonenone_selected: None Selectednormal_amount: Normal Amountnot: notnot_available: N/Anot_enough_stock: There is not enough inventory at the source location to complete this transfer.- not_found: ! '%{resource} is not found'+ not_found: "%{resource} is not found"+ not_provided: Not provided+ not_risky: Not riskynote: Notenotice_messages:icon_removed: Image has been successfully removedprices_saved: Prices successfully saved- translations_saved: Translations successfully savedproduct_cloned: Product has been clonedproduct_deleted: Product has been deleted- product_not_cloned: "Product could not be cloned. Reason: %{error}"- product_not_deleted: "Product could not be deleted. Reason: %{error}"+ product_not_cloned: 'Product could not be cloned. Reason: %{error}'+ product_not_deleted: 'Product could not be deleted. Reason: %{error}'+ translations_saved: Translations successfully savedvariant_deleted: Variant has been deleted- variant_not_deleted: "Variant could not be deleted. Reason: %{error}"+ variant_not_deleted: 'Variant could not be deleted. Reason: %{error}'num_orders: "# Orders"number: Numberok: OK@@ -1167,8 +1266,9 @@ en:only_active_products_can_be_added_to_cart: Draft and archived products cannot be added to cart, please mark the product as active before.open: Openopen_all_adjustments: Open All Adjustments+ option_name: Option nameoption_type: Option Type- option_type_filterable_info: 'When an option type is set to Filterable, your storefront visitors are presented with the option to filter a taxon of products based on the option type. A typical example of this would be to filter clothing by size and color.<br><br><b>Please Note:</b> Filters will only be visible in the storefront taxons that contain products with this option type set.'+ option_type_filterable_info: When an option type is set to Filterable, your storefront visitors are presented with the option to filter a taxon of products based on the option type. A typical example of this would be to filter clothing by size and color.<br><br><b>Please Note:</b> Filters will only be visible in the storefront taxons that contain products with this option type set.option_type_placeholder: Choose an option typeoption_types: Option Typesoption_value: Option Value@@ -1176,7 +1276,7 @@ en:optional: Optionaloptions: Optionsor: or- or_over_price: ! '%{price} or over'+ or_over_price: "%{price} or over"or_select_other_address: or select other addressorder: Orderorder_adjustments: Order adjustments@@ -1189,9 +1289,6 @@ en:order_information: Order Informationorder_line_items: Order Line Itemsorder_mailer:- subtotal: ! 'Subtotal:'- total: ! 'Order Total:'- store_team: '%{store_name} Team'cancel_email:dear_customer: Dear %{name},instructions: Your order has been CANCELED. Please retain this cancellation information for your records.@@ -1208,8 +1305,11 @@ en:heading: New Order Receivedinstructions: You have received a new order.order_summary: Order %{number} Summary- subject: '%{store_name} received a new order'+ subject: "%{store_name} received a new order"thanks: Thank you for your business.+ store_team: "%{store_name} Team"+ subtotal: 'Subtotal:'+ total: 'Order Total:'order_not_found: We couldn't find your order. Please try that action again.order_number: Order %{number}order_processed_successfully: Your order has been processed successfully@@ -1219,9 +1319,9 @@ en:awaiting_return: awaiting returncanceled: canceledcart: cart- considered_risky: considered riskycomplete: completeconfirm: confirm+ considered_risky: considered riskydelivery: deliverypayment: paymentresumed: resumed@@ -1233,14 +1333,11 @@ en:order_total: Order Totalorder_updated: Order Updatedorders: Orders+ origin: Originout_of_stock: Out of Stock- backordered_info: Backordered- backordered_confirm_info: Selected item is backordered so expect delays. Are you sure you want to order it?overview: Overviewpackage_from: package frompage: Page- pages: Pages- page_not_found: Sorry! Page you are looking can’t be found.page_blocks:buttons:display_name: Button@@ -1251,12 +1348,13 @@ en:newsletter_form:button_text_default: Submitplaceholder_default: Enter your email+ page_not_found: Sorry! Page you are looking can’t be found.page_sections:announcement_bar:default_text: Welcome to my Store!featured_taxon:- heading_default: Beloved productsbutton_text_default: Explore category+ heading_default: Beloved productsfeatured_taxons:heading_default: Shop by categoryimage_banner:@@ -1264,7 +1362,7 @@ en:text_default: This is the place to tell people about your business and what you do.image_with_text:heading_default: Welcome to my online store!- text_default: "Hi, I'm %{store_name}. I enjoy life and love to share our experiences and energy with you and the world! And here we can share some of our favorite things as well."+ text_default: Hi, I'm %{store_name}. I enjoy life and love to share our experiences and energy with you and the world! And here we can share some of our favorite things as well.newsletter:heading_default: Subscribe for more feel good contenttext_default: Thank you for choosing us as your trusted online shopping destination.@@ -1280,84 +1378,96 @@ en:video:heading_1_default: Why I recommend it?heading_2_default: There's nothing like a soft hint of blush to add dimension and color to your look.+ page_settings: Page settings+ pages: Pagespages_defaults:homepage:- featured_taxon_heading_on_sale: On salefeatured_taxon_heading_new_arrivals: New arrivals+ featured_taxon_heading_on_sale: On saleimage_with_text_heading: About me- image_with_text_text: "I'm always looking for new and exciting projects to work on. Let's make something great together!"+ image_with_text_text: I'm always looking for new and exciting projects to work on. Let's make something great together!password:newsletter_heading: Opening soonnewsletter_text: Be the first one to know when we launch.pagination:next_page: next page »- previous_page: ! '« previous page'- truncate: ! '…'+ previous_page: "« previous page"+ truncate: "…"password: Password+ password_protected: Password protectedpaste: Pastepath: Pathpay: paypayment: Payment+ payment_amount: Payment amountpayment_attempts: failed attemptspayment_could_not_be_created: Payment could not be created.payment_identifier: Payment Identifierpayment_information: Payment Informationpayment_method: Payment Method- payment_methods: Payment Methodspayment_method_not_supported: That payment method is unsupported. Please choose another one.+ payment_methods: Payment Methodspayment_processing_failed: Payment could not be processed, please check the details you enteredpayment_processor_choose_banner_text: If you need help choosing a payment processor, please visitpayment_processor_choose_link: our payments pagepayment_provider_settings: Payment Provider Settings+ payment_source: Payment sourcepayment_state: Payment Statepayment_states:balance_due: Balance duecheckout: Checkout+ complete: Complete+ completed: Completedcredit_owed: Credit owedfailed: Failedpaid: Paid- void: Void- complete: Complete- completed: Completed+ partially_refunded: Partially Refundedpending: Pendingprocessing: Processingrefunded: Refunded- partially_refunded: Partially Refunded+ void: Voidpayment_type: Payment typepayment_updated: Payment Updatedpayments: Payments+ payments_count: Payments count+ pending: Pending+ pending_sale: Pending Salepercent: Percentpercent_per_item: Percent Per Itempermalink: Permalink- pending: Pending- pending_sale: Pending Salephone: Phoneplace_order: Place Order+ please_check_back_soon: Please check back soon.please_define_payment_methods: Please define some payment methods first.please_enter_reasonable_quantity: Please enter a reasonable quantity.+ policies: Policiespopulate_get_error: Something went wrong. Please try adding the item again.- posts: Postspost_categories: Post categories+ posts: Postspowered_by: Powered by- pre_tax_refund_amount: Pre-Tax Refund Amountpre_tax_amount: Pre-Tax Amount+ pre_tax_refund_amount: Pre-Tax Refund Amountpre_tax_total: Pre-Tax Totalpreferred_reimbursement_type: Preferred Reimbursement Typepresentation: Presentation+ preview: Previewpreview_product: Preview Productpreview_taxon: Preview Taxonprevious: Previous- previous_state_missing: "n/a"+ previous_state_missing: n/apreviously_used_card: Previously Used Cardsprice: Price- prices: Pricesprice_range: Price Rangeprice_sack: Price Sack+ prices: Prices+ pricing: Pricing+ privacy_policy: Privacy Policyprocess: Process+ processing: Processingproduct: Product- product_name: Product Nameproduct_details: Product Detailsproduct_has_no_description: This product has no description+ product_name: Product Nameproduct_not_available_in_this_currency: This product is not available in the selected currency.product_properties: Product Propertiesproduct_rule:@@ -1370,11 +1480,8 @@ en:group: From product groupmanual: Manually chooseproducts: Products+ products_cannot_be_shipped: We cannot ship %{product_names} to your current location at the moment. Please change your shipping address or remove %{product_names} from your cart.promotion: Promotion- promotionable: Promotable- promotion_cloned: Promotion has been cloned- promotion_not_cloned: "Promotion has not been cloned. Reason: %{error}"- promotion_already_used: "You can not destroy promotion that was already applied"promotion_action: Promotion Actionpromotion_action_types:create_adjustment:@@ -1390,12 +1497,15 @@ en:description: Makes all shipments for the order freename: Free shippingpromotion_actions: Actions+ promotion_already_used: You can not destroy promotion that was already appliedpromotion_category: Promotion Category+ promotion_cloned: Promotion has been clonedpromotion_form:match_policies:all: Match all of these rulesany: Match any of these rules- promotion_label: 'Promotion (%{name})'+ promotion_label: Promotion (%{name})+ promotion_not_cloned: 'Promotion has not been cloned. Reason: %{error}'promotion_rule: Promotion Rulepromotion_rule_types:country:@@ -1416,17 +1526,18 @@ en:product:description: Order includes specified product(s)name: Product(s)+ taxon:+ description: Order includes products with specified taxon(s)+ name: Taxon(s)user:description: Available only to the specified customersname: Useruser_logged_in:description: Available only to logged in usersname: User Logged In- taxon:- description: Order includes products with specified taxon(s)- name: Taxon(s)- promotions: Promotionspromotion_uses: Promotion uses+ promotionable: Promotable+ promotions: Promotionspropagate_all_variants: Propagate all variantsproperties: Propertiesproperty: Property@@ -1434,22 +1545,15 @@ en:prototypes: Prototypesprovider: Providerprovider_settings_warning: If you are changing the provider type, you must save first before you can edit the provider settings+ publish: Publish+ published_at: Published atpurchased_quantity: Purchased Quantity- report_mailer:- greeting: Hi %{user_name},- thanks: Thank you,- report_done:- subject: 'Your report %{report_name} is ready'- message: Please use the link below to download it.- report_names:- products_performance: Products performance- sales_total: Sales totalqty: Qtyquantity: Quantityquantity_returned: Quantity Returnedquantity_shipped: Quantity Shipped- quick_search: Quick search..query: Query+ quick_search: Quick search..rate: Ratereason: Reasonreceive: receive@@ -1459,16 +1563,28 @@ en:reference: Referencereference_contains: Reference Containsrefund: Refund+ refund_amount_must_be_greater_than_zero: Refund amount must be greater than zerorefund_reasons: Refund Reasonsrefunded_amount: Refunded Amountrefunds: Refunds- refund_amount_must_be_greater_than_zero: Refund amount must be greater than zeroregister: Registerregistration: Registrationreimburse: Reimbursereimbursed: Reimbursedreimbursement: Reimbursement- reimbursement_perform_failed: "Reimbursement could not be performed. Error: %{error}"+ reimbursement_mailer:+ reimbursement_email:+ days_to_send: You have %{days} days to send back any items awaiting exchange.+ dear_customer: Dear %{name},+ exchange_summary: Exchange Summary+ for: for+ instructions: Your reimbursement has been processed.+ refund_summary: Refund Summary+ store_team: "%{store_name} Team"+ subject: Reimbursement Notification+ thanks: Thank you for your business.+ total_refunded: 'Total refunded: %{total}'+ reimbursement_perform_failed: 'Reimbursement could not be performed. Error: %{error}'reimbursement_status: Reimbursement statusreimbursement_type: Reimbursement typereimbursement_type_override: Reimbursement Type Override@@ -1478,27 +1594,37 @@ en:rejected: Rejectedremember_me: Remember meremove: Remove+ remove_condition: Remove conditionremove_image: Remove Imagerename: Renamereport: Report+ report_mailer:+ greeting: Hi %{user_name},+ report_done:+ message: Please use the link below to download it.+ subject: Your report %{report_name} is ready+ thanks: Thank you,+ report_names:+ products_performance: Products performance+ sales_total: Sales totalreports: Reports- required: '*'+ required: "*"required_fields: required fieldsresellable: Resellableresend: Resendreset_password: Reset my passwordresponse_code: Response Code+ restore_defaults: Restore defaultsresume: resumeresumed: Resumedreturn: return- returns: Returnsreturn_authorization: Return Authorization+ return_authorization_canceled: Return authorization canceledreturn_authorization_reasons: Return Authorization Reasonsreturn_authorization_states:authorized: Authorizedcanceled: Canceledreturn_authorization_updated: Return authorization updated- return_authorization_canceled: Return authorization canceledreturn_authorizations: Return Authorizationsreturn_item_inventory_unit_ineligible: Return item's inventory unit must be shippedreturn_item_inventory_unit_reimbursed: Return item's inventory unit is already reimbursed@@ -1507,21 +1633,11 @@ en:return_item_time_period_ineligible: Return item is outside the eligible time periodreturn_items: Return Itemsreturn_items_cannot_be_associated_with_multiple_orders: Return items cannot be associated with multiple orders.- reimbursement_mailer:- reimbursement_email:- store_team: '%{store_name} Team'- days_to_send: ! 'You have %{days} days to send back any items awaiting exchange.'- dear_customer: Dear %{name},- exchange_summary: Exchange Summary- for: for- instructions: Your reimbursement has been processed.- refund_summary: Refund Summary- subject: Reimbursement Notification- total_refunded: ! 'Total refunded: %{total}'- thanks: Thank you for your business.return_number: Return Numberreturn_quantity: Return Quantityreturned: Returned+ returns: Returns+ returns_policy: Returns Policyreview: Reviewrisk: Riskrisk_analysis: Risk Analysis@@ -1544,59 +1660,63 @@ en:say_no: 'No'say_yes: 'Yes'scope: Scope- seed:- shipping:- categories:- default: Default- digital: Digital+ scopes: Scopessearch: Searchsearch_by: 'Search by:'+ search_engine_listing: Search engine listingsearch_order_number: Order Numbersearch_results: Search results for '%{keywords}'+ search_results_for: Search results for %{query}searching: Searchingsecure_connection_type: Secure Connection Type+ security: Securitysecurity_settings: Security Settings+ seed:+ shipping:+ categories:+ default: Default+ digital: Digitalselect: Select- select_from_prototype: Select From Prototypeselect_a_date: Select a dateselect_a_date_range: Select a date rangeselect_a_return_authorization_reason: Select a reason for the return authorizationselect_a_stock_location: Select a stock locationselect_a_store_credit_reason: Select a reason for the store creditselect_an_option: Select an option+ select_existing_address: Select existing address+ select_from_prototype: Select From Prototypeselect_stock: Select stockselect_stores: Select Store(s)select_user: Select customer- selected_quantity_not_available: ! 'selected of %{item} is not available.'+ selected_quantity_not_available: selected of %{item} is not available.send_copy_of_all_mails_to: Send Copy of All Mails Tosend_mails_as: Send Mails Assend_payment_link: Send payment link+ send_payment_link_title: Send payment link titleseo: SEOseo_robots: SEO Robotsseo_title: SEO Title- search_results_for: "Search results for ${query}"server: Serverserver_error: The server returned an errorsettings: Settingsship: Ship- ship_to: "Shipping to:"ship_address: Ship Address+ ship_to: 'Shipping to:'ship_total: Ship Totalshipment: Shipment- shipment_adjustments: "Shipment adjustments"- shipment_details: "From %{stock_location} via %{shipping_method}"+ shipment_adjustments: Shipment adjustments+ shipment_details: From %{stock_location} via %{shipping_method}shipment_mailer:shipped_email:- store_team: '%{store_name} Team'dear_customer: Dear %{name},instructions: Your order %{number} has been shippedshipment_summary: Shipment Summary for order- shipping_method: "Shipping method: %{shipping_method}"+ shipping_method: 'Shipping method: %{shipping_method}'+ store_team: "%{store_name} Team"subject: Shipment Notificationthanks: Thank you for your business.- track_information: ! 'Tracking Information: %{tracking}'- track_link: "Tracking Link: %{url}"- shipment_successfully_shipped: Shipment successfully shipped+ track_information: 'Tracking Information: %{tracking}'+ track_link: 'Tracking Link: %{url}'shipment_state: Shipment Stateshipment_states:backorder: Backorder@@ -1605,8 +1725,9 @@ en:pending: Unfulfilledready: Unfulfilledshipped: Fulfilled- shipment_transfer_success: 'Variants successfully transferred'- shipment_transfer_error: 'There was an error transferring variants'+ shipment_successfully_shipped: Shipment successfully shipped+ shipment_transfer_error: There was an error transferring variants+ shipment_transfer_success: Variants successfully transferredshipments: Shipmentsshipped: Shippedshipping: Shipping@@ -1619,15 +1740,16 @@ en:shipping_instructions: Shipping Instructionsshipping_method: Shipping Methodshipping_methods: Shipping Methods+ shipping_policy: Shipping Policyshipping_price_sack: Price sackshipping_rates:display_price:- including_tax: "%{price} (incl. %{tax_amount} %{tax_rate_name})"excluding_tax: "%{price} (+ %{tax_amount} %{tax_rate_name})"+ including_tax: "%{price} (incl. %{tax_amount} %{tax_rate_name})"shipping_total: Shipping totalshipping_zone: Shipping Zone- shop_by_taxonomy: Shop by %{taxonomy}shop_all: Shop All+ shop_by_taxonomy: Shop by %{taxonomy}shopping_cart: Shopping Cartshow: Showshow_active: Show Active@@ -1638,27 +1760,34 @@ en:show_only_considered_risky: Only show risky ordersshow_property: Show Propertyshow_rate_in_label: Show rate in label+ show_report: Show reportshow_store_selector:- short: Show Store selectorlong: Display the Store selector in the main nav bar of Storefront and allow users to change Store and Currency+ short: Show Store selectorsign_up: Sign Up+ site_name: Site name+ size: Sizesku: SKUskus: SKUsslug: Slug- source: Sourcesocial: Social+ social_media: Social mediasomething_went_wrong: Something went wrong+ source: Sourcespecial_instructions: Special Instructionssplit: Splitspree_gateway_error_flash_for_checkout: There was a problem with your payment information. Please check your information and try again.+ square_image: Square imagessl:- change_protocol: "Please switch to using HTTP (rather than HTTPS) and retry this request."+ change_protocol: Please switch to using HTTP (rather than HTTPS) and retry this request.+ standards_and_formats: Standards and formatsstart: Start+ start_typing_to_search_for_products: Start typing to search for products+ start_typing_to_search_for_variants: Start typing to search for variantsstarting_from: Starts atstate: Statestate_based: State Basedstate_changes: State Changes- states: Statesstate_machine_states:accepted: Acceptedaddress: Address@@ -1666,22 +1795,22 @@ en:awaiting: Awaitingawaiting_return: Awaiting returnbackordered: Back ordered- cart: Cartcanceled: Canceled+ cart: Cartcheckout: Checkout- confirm: Confirm+ closed: Closedcomplete: Completecompleted: Completed- closed: Closed+ confirm: Confirmdelivery: Deliveryerrored: Erroredfailed: Failedgiven_to_customer: Given to customerinvalid: Invalidmanual_intervention_required: Manual intervention required+ on_hand: On handopen: Openorder: Order- on_hand: On handpayment: Paymentpending: Pendingprocessing: Processing@@ -1692,11 +1821,10 @@ en:shipment: Shipmentshipped: Shippedvoid: Void+ states: Statesstates_required: States Requiredstatus: Statusstock: Stock- default_stock_location_name: Shop location- default_country: Default Countrystock_location: Stock Locationstock_location_info: Stock location infostock_locations: Stock Locations@@ -1706,94 +1834,99 @@ en:stock_movements: Stock Movementsstock_movements_for_stock_location: Stock Movements for %{stock_location_name}stock_successfully_transferred: Stock was successfully transferred between locations.- stock_transfer_name: Stock Transferstock_transfer:errors:must_have_variant: You must add at least one variant- variants_unavailable: "Some variants are not available on %{stock}"- same_location: "cannot be the same as the destination location"+ same_location: cannot be the same as the destination location+ variants_unavailable: Some variants are not available on %{stock}+ stock_transfer_name: Stock Transferstock_transfers: Stock Transfersstop: Stopstore: Store- store_errors:- unable_to_create: Unable to create store.- unable_to_update: Unable to update store.- unable_to_delete: Unable to delete store.- store_form:- code_help: "Store unique identifier, which is an abbreviated version of the store’s name (used as the layout directory name, and also helpful for separating templates by store)"- checkout_zone_help: "Selecting zone will limit to which Countries or States products are shipped.- For more information <a href='https://guides.spreecommerce.org/user/configuration/configuring_geography.html#zones' target='_blank' class='alert-link'>please see documentation</a>"- locales_help: "Install <a href='https://github.com/spree-contrib/spree_i18n' target='_blank' class='alert-link'>Spree I18n extension</a> to add more locales"- social_help: "If you want to link to your social accounts in the footer part of your website please fill below fields"- default_country_help: "This is the Country that will be pre-selected on the Checkout Address form"- footer_help: "This content is visible in the footer section of your Store"- mail_from_address_help: "This is the email which will be the sender of all your Store emails (Order Confirmation, Shipment notification etc)"- customer_support_email_help: "This email is visible to your Store visitors in the Footer section"- new_order_notifications_email_help: "If you want to receive an email notification every time someone places an Order please provide an email address for that notification to be sent to"- seo_robots: "Please check <a href='https://developers.google.com/search/reference/robots_meta_tag' target='_blank'>this page for more help</a>"- stores: Stores- store_credit_name: Store Creditstore_credit:- credit: "Credit"- authorized: "Authorized"- captured: "Used"- allocated: "Added"- apply: Apply- remove: Remove- applicable_amount: "<strong>%{amount}</strong> in store credit will be applied to this order."- available_amount: "You have <strong>%{amount}</strong> in Store Credit available!"- remaining_amount: "You have <strong>%{amount}</strong> remaining in your account's Store Credit."additional_payment_needed: Select another payment method for the remaining <strong>%{amount}</strong>.+ allocated: Added+ applicable_amount: "<strong>%{amount}</strong> in store credit will be applied to this order."+ apply: Apply+ authorized: Authorized+ available_amount: You have <strong>%{amount}</strong> in Store Credit available!+ captured: Used+ credit: Crediterrors:cannot_change_used_store_credit: You cannot change a store credit that has already been usedunable_to_create: Unable to create store creditunable_to_delete: Unable to delete store creditunable_to_fund: Unable to pay for order using store creditsunable_to_update: Unable to update store credit- store_credits: Store Credits+ remaining_amount: You have <strong>%{amount}</strong> remaining in your account's Store Credit.+ remove: Removestore_credit_categories: Store Credit Categories+ store_credit_name: Store Creditstore_credit_payment_method:- unable_to_void: "Unable to void code: %{auth_code}"- unable_to_credit: "Unable to credit code: %{auth_code}"- successful_action: "Successful store credit %{action}"- unable_to_find: "Could not find store credit"- insufficient_funds: "Store credit amount remaining is not sufficient"- currency_mismatch: "Store credit currency does not match order currency"- insufficient_authorized_amount: "Unable to capture more than authorized amount"- unable_to_find_for_action: "Could not find store credit for auth code: %{auth_code} for action: %{action}"- user_has_no_store_credits: "User does not have any available store credit"- select_one_store_credit: "Select store credit to go towards remaining balance"+ currency_mismatch: Store credit currency does not match order currency+ insufficient_authorized_amount: Unable to capture more than authorized amount+ insufficient_funds: Store credit amount remaining is not sufficient+ select_one_store_credit: Select store credit to go towards remaining balance+ successful_action: Successful store credit %{action}+ unable_to_credit: 'Unable to credit code: %{auth_code}'+ unable_to_find: Could not find store credit+ unable_to_find_for_action: 'Could not find store credit for auth code: %{auth_code} for action: %{action}'+ unable_to_void: 'Unable to void code: %{auth_code}'+ user_has_no_store_credits: User does not have any available store credit+ store_credits: Store Creditsstore_default: Default store- store_set_default_button: Set as default+ store_details: Store details+ store_errors:+ unable_to_create: Unable to create store.+ unable_to_delete: Unable to delete store.+ unable_to_update: Unable to update store.+ store_form:+ checkout_zone_help: Selecting zone will limit to which Countries or States products are shipped. For more information <a href='https://guides.spreecommerce.org/user/configuration/configuring_geography.html#zones' target='_blank' class='alert-link'>please see documentation</a>+ code_help: Store unique identifier, which is an abbreviated version of the store’s name (used as the layout directory name, and also helpful for separating templates by store)+ customer_support_email_help: This email is visible to your Store visitors in the Footer section+ default_country_help: This is the Country that will be pre-selected on the Checkout Address form+ footer_help: This content is visible in the footer section of your Store+ locales_help: Install <a href='https://github.com/spree-contrib/spree_i18n' target='_blank' class='alert-link'>Spree I18n extension</a> to add more locales+ mail_from_address_help: This is the email which will be the sender of all your Store emails (Order Confirmation, Shipment notification etc)+ new_order_notifications_email_help: If you want to receive an email notification every time someone places an Order please provide an email address for that notification to be sent to+ seo_robots: Please check <a href='https://developers.google.com/search/reference/robots_meta_tag' target='_blank'>this page for more help</a>+ social_help: If you want to link to your social accounts in the footer part of your website please fill below fields+ store_name: Store namestore_not_set_as_default: Couldn't set store %{store} as a default storestore_set_as_default: Store %{store} is now a default store+ store_set_default_button: Set as default+ storefront: Storefront+ stores: Storesstreet_address: Street Addressstreet_address_2: Street Address (cont'd)subtotal: Subtotalsubtract: Subtractsuccess: Success- successfully_created: ! '%{resource} has been successfully created!'- successfully_refunded: ! '%{resource} has been successfully refunded!'- successfully_removed: ! '%{resource} has been successfully removed!'- successfully_updated: ! '%{resource} has been successfully updated!'+ successfully_created: "%{resource} has been successfully created!"+ successfully_refunded: "%{resource} has been successfully refunded!"+ successfully_removed: "%{resource} has been successfully removed!"+ successfully_updated: "%{resource} has been successfully updated!"summary: Summarysupport: Supportsupported_currencies: Supported Currenciessupported_currencies_long: A comma separated list of supported currenciessupported_locales: Supported Locales+ switch_store: Switch store+ switch_team: Switch team+ tags: Tags+ tags_placeholder: Add Tagstax: Tax- tax_included: "Tax (incl.)"tax_categories: Tax Categoriestax_category: Tax Categorytax_code: Tax Code+ tax_included: Tax (incl.)tax_rate_amount_explanation: Tax rates are a decimal amount to aid in calculations, (i.e. if the tax rate is 5% then enter 0.05)tax_rates: Tax Rates+ taxes: Taxestaxon: Taxontaxon_edit: Edit Taxon- taxon_placeholder: Add a Taxon- tags: Tags- tags_placeholder: Add Tagstaxon_missing_alt: Category banner description+ taxon_placeholder: Add a Taxontaxon_rule:choose_taxons: Choose taxonslabel: Order must contain x amount of these taxons@@ -1806,13 +1939,9 @@ en:taxonomy_collections_name: Collectionstaxonomy_edit: Edit taxonomytaxonomy_tree_error: The requested change has not been accepted and the tree has been returned to its previous state, please try again.- taxonomy_tree_instruction: ! '* Right click (or double tap on iOS device) a child in the tree to access the menu for adding, deleting or sorting a child.'+ taxonomy_tree_instruction: "* Right click (or double tap on iOS device) a child in the tree to access the menu for adding, deleting or sorting a child."taxons: Taxons- title: Title- true_label: "TRUE"- automatic_taxon_names:- on_sale: On sale- new_arrivals: New arrivals+ terms_of_service: Terms of Servicetest: Testtest_mailer:test_email:@@ -1820,20 +1949,37 @@ en:message: If you have received this email, then your email settings are correct.subject: Test Mailtest_mode: Test Mode+ text_alignment: Text alignmentthank_you_for_your_order: Thank you for your business. Please print out a copy of this confirmation page for your records.- there_are_no_items_for_this_order: There are no items for this order- themes: Themes+ theme: Themetheme_copied: Theme has been successfully copied.- theme_not_copied: "Theme could not be copied with errors: %{error}"theme_duplicating: Theme is still duplicatingtheme_is_now_live: Theme is now live+ theme_not_copied: 'Theme could not be copied with errors: %{error}'+ theme_settings:+ accent_color: Accent color+ background_color: Background color+ border_color: Border color+ brand_color: Brand color+ button_border_color: Button border color+ button_text_color: Button text color+ danger_color: Danger color+ input_text_color: Input text color+ neutral_color: Neutral color+ success_color: Success color+ text_color: Text color+ themes: Themes+ there_are_no_items_for_this_order: There are no items for this orderthere_were_problems_with_the_following_fields: There were problems with the following fieldsthis_order_has_already_received_a_refund: This order has already received a refundthumbnail: Thumbnail- tiers: Tierstiered_flat_rate: Tiered Flat Ratetiered_percent: Tiered Percent+ tiers: Tierstime: Time+ timezone: Timezone+ title: Title+ title_link: Title linkto_add_variants_you_must_first_define: To add variants, you must first definetotal: Totaltotal_per_item: Total per item@@ -1841,6 +1987,7 @@ en:total_price: Total pricetotal_sales: Total Salestrack_inventory: Track Inventory+ track_quantity: Track quantitytracking: Trackingtracking_number: Tracking Numbertracking_url: Tracking URL@@ -1852,64 +1999,83 @@ en:translations: Translationstranslations_for: "%{resource_name} translations"tree: Tree+ true_label: 'TRUE'+ twitter: Twittertype: Typetype_to_search: Type to search- twitter: Twitterunable_to_connect_to_gateway: Unable to connect to gateway.unable_to_create_reimbursements: Unable to create reimbursements because there are items pending manual intervention.under_price: Under %{price}+ unit: Unitunit_system: Unit systemunit_systems:- metric_system: Metric systemimperial_system: Imperial systemmetric: metric+ metric_system: Metric systemunlock: Unlockunrecognized_card_type: Unrecognized card typeunshippable_items: Unshippable Itemsupdate: Update+ update_address: Update address+ update_billing_address: Update billing address+ update_contact_information: Update contact information+ update_shipping_address: Update shipping address+ updated: Updatedupdating: Updating+ upload_image: Upload imageurl: URLusage_limit: Usage Limituse_app_default: Use App Defaultuse_billing_address: Use Billing Address- use_shipping_address: Use Shipping Addressuse_existing_cc: Use an existing card on fileuse_new_cc: Use a new carduse_new_cc_or_payment_method: Use a new card / payment methoduse_s3: Use Amazon S3 For Images+ use_shipping_address: Use Shipping Addressused: Useduser: User+ user_not_found: User not founduser_rule:choose_users: 'Input the full email address of a registered customer(s) in the search field to whom this discount should apply:'users: Usersvalidation:- unpaid_amount_not_zero: "Amount was not fully reimbursed. Still due: %{amount}"cannot_be_less_than_shipped_units: cannot be less than the number of shipped units.cannot_destroy_line_item_as_inventory_units_have_shipped: Cannot destroy line item as some inventory units have shipped.exceeds_available_stock: exceeds available stock. Please ensure line items have a valid quantity.is_too_large: is too large -- stock on hand cannot cover requested quantity!must_be_int: must be an integermust_be_non_negative: must be a non-negative value+ unpaid_amount_not_zero: 'Amount was not fully reimbursed. Still due: %{amount}'value: Valuevariant: Variantvariant_placeholder: Choose a variantvariant_prices_search_placeholder: Search for SKU or variant name...variants: Variants+ variants_count: Variants count+ vendor: Vendor+ vendors: Vendorsversion: Version+ view: View+ view_store: View store+ view_your_store: View your store+ visibility: Visibility+ visits: Visitsvoid: Void+ we_are_busy_updating: We're updating the %{store_name} homepage.+ we_are_busy_updating_page: We're busy updating this page.we_will_be_back: We will be back.- we_are_busy_updating: "We're updating the %{store_name} homepage."- we_are_busy_updating_page: "We're busy updating this page."- please_check_back_soon: Please check back soon.+ webhooks: Webhooksweight: Weight+ weight_unit: Weight unitweight_units:- kilogram: Kilogram (kg)gram: Gram (g)- pound: Pound (lb)+ kilogram: Kilogram (kg)ounce: Ounce (oz)+ pound: Pound (lb)what_is_a_cvv: What is a (CVV) Credit Card Code?what_is_this: What's This?width: Width+ without_taxon: Without taxonyear: Yearyou_have_no_orders_yet: You have no orders yetyour_cart_is_empty: Your cart is empty@@ -1919,8 +2085,6 @@ en:zipcode_required: Zip Code Requiredzone: Zonezones: Zones- no_limits_zone: No Limits- terms_of_service: Terms of Service- privacy_policy: Privacy Policy- returns_policy: Returns Policy- shipping_policy: Shipping Policy+ views:+ pagination:+ truncate: Truncatediff --git a/core/spec/i18n_spec.rb b/core/spec/i18n_spec.rbnew file mode 100644index 0000000000..eacd60d02f--- /dev/null+++ b/core/spec/i18n_spec.rb@@ -0,0 +1,27 @@+require 'spec_helper'+require 'i18n/tasks'++RSpec.describe I18n do+ let(:i18n) { I18n::Tasks::BaseTask.new }+ let(:missing_keys) { i18n.missing_keys }+ let(:inconsistent_interpolations) { i18n.inconsistent_interpolations }++ it 'does not have missing keys' do+ expect(missing_keys).to be_empty,+ "Missing #{missing_keys.leaves.count} i18n keys, run `i18n-tasks missing' to show them"+ end++ it 'files are normalized' do+ non_normalized = i18n.non_normalized_paths+ error_message = "The following files need to be normalized:\n" \+ "#{non_normalized.map { |path| " #{path}" }.join("\n")}\n" \+ "Please run `i18n-tasks normalize' to fix"+ expect(non_normalized).to be_empty, error_message+ end++ it 'does not have inconsistent interpolations' do+ error_message = "#{inconsistent_interpolations.leaves.count} i18n keys have inconsistent interpolations.\n" \+ "Run `i18n-tasks check-consistent-interpolations' to show them"+ expect(inconsistent_interpolations).to be_empty, error_message+ end+enddiff --git a/core/spree_core.gemspec b/core/spree_core.gemspecindex 5b14269738..1c6d4efbd1 100644--- a/core/spree_core.gemspec+++ b/core/spree_core.gemspec@@ -26,6 +26,8 @@ Gem::Specification.new do |s|s.files = Dir["{app,config,db,lib}/**/*", "LICENSE.md", "Rakefile"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }s.require_path = 'lib'+ s.add_development_dependency 'i18n-tasks'+s.add_dependency 'rails', '>= 7.2', '< 8.0's.add_dependency 'activemerchant', '~> 1.67'