Bump paypal gem to patched version

(cherry picked from commit 766b7449d8)

Gemfile.lock

@@ -6,7 +6,7 @@ GIT
 
 GIT
   remote: https://github.com/openfoodfoundation/better_spree_paypal_express.git
-  revision: e28e4a8c5cedba504eea9cdad4be440d277d7e68
+  revision: 1736e3268239a841576d2719a1f276cf9b74c5c5
   branch: 2-1-0-stable
   specs:
     spree_paypal_express (2.0.3)

config/locales/ar.yml

@@ -1021,10 +1021,13 @@ ar:
         name: "ملخص رسوم الشركات"
         description: "ملخص رسوم الشركات التي تم جمعها"
     subscriptions:
-      subscriptions: الاشتراكات
-      new: اشتراك جديد
-      create: إنشاء اشتراك
-      edit: تحرير الاشتراك
+      index:
+        title: "الاشتراكات"
+        new: "اشتراك جديد"
+      new:
+        title: "اشتراك جديد"
+      edit:
+        title: "تحرير الاشتراك"
       table:
         edit_subscription: تحرير الاشتراك
         pause_subscription: وقف مؤقت الاشتراك
@@ -1033,6 +1036,7 @@ ar:
       filters:
         query_placeholder: "البحث عن طريق البريد الإلكتروني ..."
       setup_explanation:
+        title: "الاشتراكات"
         just_a_few_more_steps: 'فقط بضع خطوات أخرى قبل أن تبدأ:'
         enable_subscriptions: "تمكين الاشتراكات في واحد على الأقل من المتاجر الخاصة بك"
         enable_subscriptions_step_1_html: 1. انتقل إلى صفحة %{enterprises_link} ، وابحث عن متجرك ، وانقر على "إدارة"
@@ -1046,6 +1050,8 @@ ar:
         create_at_least_one_schedule_step_3: 3. انقر فوق "+ جدول جديد" ، واملأ النموذج
         once_you_are_done_you_can_html: بمجرد الانتهاء من ذلك ، يمكنك %{reload_this_page_link}
         reload_this_page: اعد تحميل هذه الصفحة
+      form:
+        create: "إنشاء اشتراك"
       steps:
         details: 1. التفاصيل الأساسية
         address: 2. العنوان
@@ -3244,6 +3250,27 @@ ar:
       invoice_email:
         hi: "مرحبًا %{name}"
         invoice_attached_text: يرجى الاطلاع على فاتورة مرفقة لطلبك الأخير من
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            تم تقديم طلب لإعادة تعيين كلمة المرور الخاصة بك.
+            إذا لم تقدم هذا الطلب ، ببساطة تجاهل هذا البريد الإلكتروني.
+        link_text: >
+            إذا قمت بهذا الطلب ، فما عليك سوى النقر فوق الرابط أدناه:
+        issue_text: |
+            إذا لم يعمل عنوان URL أعلاه ، فحاول نسخه ولصقه في متصفحك.
+            إذا كنت لا تزال تواجه مشاكل ، فلا تتردد في الاتصال بنا.
+      confirmation_instructions:
+        subject: "يرجى تأكيد حسابك OFN"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "عزيزي العميل،"
+        instructions: "تم شحن طلبك"
+        shipment_summary: "ملخص الشحن"
+        subject: "إشعار الشحن"
+        thanks: "شكرا لك على اعمالك."
+        track_information: "معلومات التتبع : %{tracking}"
+        track_link: "رابط التتبع: %{url}"
     order_state:
       address: العنوان
       adjustments: التعديلات
@@ -3265,18 +3292,6 @@ ar:
       ended: انتهى
       paused: التعليق
       canceled: الالغاء
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            تم تقديم طلب لإعادة تعيين كلمة المرور الخاصة بك.
-            إذا لم تقدم هذا الطلب ، ببساطة تجاهل هذا البريد الإلكتروني.
-        link_text: >
-            إذا قمت بهذا الطلب ، فما عليك سوى النقر فوق الرابط أدناه:
-        issue_text: |
-            إذا لم يعمل عنوان URL أعلاه ، فحاول نسخه ولصقه في متصفحك.
-            إذا كنت لا تزال تواجه مشاكل ، فلا تتردد في الاتصال بنا.
-      confirmation_instructions:
-        subject: يرجى تأكيد حسابك OFN
     users:
       form:
         account_settings: إعدادت الحساب

config/locales/ca.yml

@@ -1039,10 +1039,13 @@ ca:
         name: "Resum de les comissions de l'organització"
         description: "Resum de les comissions de l'organització recollides"
     subscriptions:
-      subscriptions: Subscripcions
-      new: Nova subscripció
-      create: Crea una subscripció
-      edit: Edita la subscripció
+      index:
+        title: "Subscripcions"
+        new: "Nova subscripció"
+      new:
+        title: "Nova subscripció"
+      edit:
+        title: "Edita la subscripció"
       table:
         edit_subscription: Edita la subscripció
         pause_subscription: Pausa la subscripció
@@ -1051,6 +1054,7 @@ ca:
       filters:
         query_placeholder: "Cerca per correu electrònic ..."
       setup_explanation:
+        title: "Subscripcions"
         just_a_few_more_steps: 'Només uns quants passos més abans de començar:'
         enable_subscriptions: "Activa les subscripcions d'almenys una de les teves botigues"
         enable_subscriptions_step_1_html: 1. Aneu a la pàgina %{enterprises_link}, cerqueu la vostra botiga i feu clic a "Gestionar"
@@ -1064,6 +1068,8 @@ ca:
         create_at_least_one_schedule_step_3: 3. Fes clic a '+ Nova programació' i omple el formulari
         once_you_are_done_you_can_html: Un cop hagueu acabat, podeu %{reload_this_page_link}
         reload_this_page: tornar a carregar aquesta pàgina
+      form:
+        create: "Crea una subscripció"
       steps:
         details: 1. Detalls bàsics
         address: 2. Adreça
@@ -1938,7 +1944,7 @@ ca:
   admin_enterprise_groups: "Grups d'organització"
   admin_enterprise_groups_name: "Nom"
   admin_enterprise_groups_owner: "Propietària"
-  admin_enterprise_groups_on_front_page: "A la primera pàgina?"
+  admin_enterprise_groups_on_front_page: "Visible a la web"
   admin_enterprise_groups_enterprise: "Organitzacions"
   admin_enterprise_groups_data_powertip: "La usuària principal responsable d'aquest grup."
   admin_enterprise_groups_data_powertip_logo: "Això és el logotip del grup"
@@ -3353,6 +3359,27 @@ ca:
       invoice_email:
         hi: "Hola %{name}"
         invoice_attached_text: Trobareu adjunta un comprovant de la compra per a la vostra comanda recent
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            S'ha fet una sol·licitud per restablir la teva contrasenya.
+            Si no has fet aquesta sol·licitud, simplement ignora aquest correu electrònic.
+        link_text: >
+            Si has fet aquesta sol·licitud, fes clic a l'enllaç següent:
+        issue_text: |
+            Si l'URL anterior no funciona, prova de copiar-lo i enganxar-lo al navegador.
+            Si continues tenint problemes, no dubtis en contactar-nos.
+      confirmation_instructions:
+        subject: "Si us plau confirma el teu compte d'OFN"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Benvolguda consumidora:"
+        instructions: "La vostra comanda s'ha enviat"
+        shipment_summary: "Resum de l'enviament"
+        subject: "Notificació d'enviament"
+        thanks: "Gràcies per la teva compra."
+        track_information: "Informació del seguiment: %{tracking}"
+        track_link: "Enllaç del seguiment: %{url}"
     order_state:
       address: adreça
       adjustments: ajustaments
@@ -3374,18 +3401,6 @@ ca:
       ended: acabat
       paused: en pausa
       canceled: cancel·lat
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            S'ha fet una sol·licitud per restablir la teva contrasenya.
-            Si no has fet aquesta sol·licitud, simplement ignora aquest correu electrònic.
-        link_text: >
-            Si has fet aquesta sol·licitud, fes clic a l'enllaç següent:
-        issue_text: |
-            Si l'URL anterior no funciona, prova de copiar-lo i enganxar-lo al navegador.
-            Si continues tenint problemes, no dubtis en contactar-nos.
-      confirmation_instructions:
-        subject: Si us plau confirma el teu compte d'OFN
     users:
       form:
         account_settings: Configuració del compte

config/locales/de_DE.yml

@@ -1029,10 +1029,13 @@ de_DE:
         name: "Unternehmensgebühr Zusammenfassung"
         description: "Zusammenfassung der erhobenen Zuschläge"
     subscriptions:
-      subscriptions: Abonnements
-      new: Neues Abonnement
-      create: Abonnement erstellen
-      edit: Abonnement bearbeiten
+      index:
+        title: "Abonnements"
+        new: "Neues Abonnement"
+      new:
+        title: "Neues Abonnement"
+      edit:
+        title: "Abonnement bearbeiten"
       table:
         edit_subscription: Abonnement bearbeiten
         pause_subscription: Abonement pausieren
@@ -1041,6 +1044,7 @@ de_DE:
       filters:
         query_placeholder: "Suche per E-Mail ..."
       setup_explanation:
+        title: "Abonnements"
         just_a_few_more_steps: 'Nur noch ein paar Schritte bevor Sie beginnen können:'
         enable_subscriptions: "Aktivieren Sie Abonnements für mindestens einen Ihrer Läden"
         enable_subscriptions_step_1_html: 1. Gehen Sie zur Seite %{enterprises_link}, suchen Sie Ihren Laden und klicken Sie auf "Verwalten"
@@ -1054,6 +1058,8 @@ de_DE:
         create_at_least_one_schedule_step_3: 3. Klicken Sie auf "+ Neuer Zeitplan" und füllen Sie das Formular aus
         once_you_are_done_you_can_html: Sobald Sie fertig sind, können Sie %{reload_this_page_link}
         reload_this_page: diese Seite neu laden
+      form:
+        create: "Abonnement erstellen"
       steps:
         details: 1. Grundlegendes
         address: 2. Adresse
@@ -3259,6 +3265,27 @@ de_DE:
       invoice_email:
         hi: "Hallo %{name}"
         invoice_attached_text: Im Anhang findest Du eine Rechnung für die letzte Bestellung vom
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            Es wurde angefragt, das Passwort zurückzusetzen.
+            Sollte kein neues Passwort angefordert werden, bitte dieses E-Mail ignorieren.
+        link_text: >
+            Sollte ein neues Passwort angefordert werden, bitte den folgenden Aktivierungslink
+            bestätigen.
+        issue_text: |
+            Falls die URL nicht funktioniert, bitte den Link kopieren und in die Adresszeile Ihres Browsers einfügen
+      confirmation_instructions:
+        subject: "Bitte OFN-Konto bestätigen"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Sehr geehrter Kunde,"
+        instructions: "Ihre Bestellung wurde versandt"
+        shipment_summary: "Übersicht"
+        subject: "Versandbenachrichtigung"
+        thanks: "Danke für Ihren Einkauf."
+        track_information: "Tracking-Informationen: %{tracking}"
+        track_link: "Tracking-Link: %{url}"
     order_state:
       address: Adresse
       adjustments: Verbesserungen
@@ -3280,18 +3307,6 @@ de_DE:
       ended: beendet
       paused: pausiert
       canceled: storniert
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            Es wurde angefragt, das Passwort zurückzusetzen.
-            Sollte kein neues Passwort angefordert werden, bitte dieses E-Mail ignorieren.
-        link_text: >
-            Sollte ein neues Passwort angefordert werden, bitte den folgenden Aktivierungslink
-            bestätigen.
-        issue_text: |
-            Falls die URL nicht funktioniert, bitte den Link kopieren und in die Adresszeile Ihres Browsers einfügen
-      confirmation_instructions:
-        subject: Bitte OFN-Konto bestätigen
     users:
       form:
         account_settings: Konto Einstellungen

config/locales/en_AU.yml

@@ -1028,10 +1028,13 @@ en_AU:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1040,6 +1043,7 @@ en_AU:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1053,6 +1057,8 @@ en_AU:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3187,6 +3193,27 @@ en_AU:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your business."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3208,18 +3235,6 @@ en_AU:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings

config/locales/en_BE.yml

@@ -991,10 +991,13 @@ en_BE:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1003,6 +1006,7 @@ en_BE:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1016,6 +1020,8 @@ en_BE:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3096,6 +3102,27 @@ en_BE:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your business."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3117,18 +3144,6 @@ en_BE:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings

config/locales/en_CA.yml

@@ -1035,10 +1035,13 @@ en_CA:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1047,6 +1050,7 @@ en_CA:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1060,6 +1064,8 @@ en_CA:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3345,6 +3351,27 @@ en_CA:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer, "
+        instructions: "Your order has been shipped or picked up."
+        shipment_summary: "Shipment/Pick Up Summary"
+        subject: "Shipment/Pick Up Notification"
+        thanks: "Thank you for your business."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3366,18 +3393,6 @@ en_CA:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings

config/locales/en_DE.yml

@@ -999,10 +999,13 @@ en_DE:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1011,6 +1014,7 @@ en_DE:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1024,6 +1028,8 @@ en_DE:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3113,6 +3119,27 @@ en_DE:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your business."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3134,18 +3161,6 @@ en_DE:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings

config/locales/en_GB.yml

@@ -1035,10 +1035,13 @@ en_GB:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1047,6 +1050,7 @@ en_GB:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1060,6 +1064,8 @@ en_GB:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3352,6 +3358,27 @@ en_GB:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your order with us."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3373,18 +3400,6 @@ en_GB:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings

config/locales/en_IE.yml

@@ -1034,10 +1034,13 @@ en_IE:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1046,6 +1049,7 @@ en_IE:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1059,6 +1063,8 @@ en_IE:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3350,6 +3356,27 @@ en_IE:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your order with us."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3371,18 +3398,6 @@ en_IE:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings

config/locales/en_IN.yml

@@ -1035,10 +1035,13 @@ en_IN:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1047,6 +1050,7 @@ en_IN:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1060,6 +1064,8 @@ en_IN:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3352,6 +3358,27 @@ en_IN:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your order with us."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3373,18 +3400,6 @@ en_IN:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings

config/locales/en_NZ.yml

@@ -1035,10 +1035,13 @@ en_NZ:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1047,6 +1050,7 @@ en_NZ:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1060,6 +1064,8 @@ en_NZ:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3346,6 +3352,27 @@ en_NZ:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your business."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3367,18 +3394,6 @@ en_NZ:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings

config/locales/en_PH.yml

@@ -1027,10 +1027,13 @@ en_PH:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1039,6 +1042,7 @@ en_PH:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1052,6 +1056,8 @@ en_PH:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3279,6 +3285,27 @@ en_PH:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your business."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3300,18 +3327,6 @@ en_PH:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings

config/locales/en_US.yml

@@ -1034,10 +1034,13 @@ en_US:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1046,6 +1049,7 @@ en_US:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1059,6 +1063,8 @@ en_US:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3344,6 +3350,27 @@ en_US:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below.
+        issue_text: |
+            If the above URL does nor work, try to copy and paste it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your business."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3365,18 +3392,6 @@ en_US:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below.
-        issue_text: |
-            If the above URL does nor work, try to copy and paste it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings

config/locales/en_ZA.yml

@@ -1029,10 +1029,13 @@ en_ZA:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1041,6 +1044,7 @@ en_ZA:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1054,6 +1058,8 @@ en_ZA:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3172,6 +3178,27 @@ en_ZA:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your order with us."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3193,18 +3220,6 @@ en_ZA:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings

config/locales/es.yml

@@ -1038,10 +1038,13 @@ es:
         name: "Resumen de las comisiones de la organización"
         description: "Resumen de las comisiones de la organización recolectadas"
     subscriptions:
-      subscriptions: Suscripciones
-      new: Nueva suscripción
-      create: Crear suscripción
-      edit: Editar suscripción
+      index:
+        title: "Suscripciones"
+        new: "Nueva suscripción"
+      new:
+        title: "Nueva suscripción"
+      edit:
+        title: "Editar suscripción"
       table:
         edit_subscription: Editar suscripción
         pause_subscription: Pausa Suscripción
@@ -1050,6 +1053,7 @@ es:
       filters:
         query_placeholder: "Buscar por correo electrónico ..."
       setup_explanation:
+        title: "Suscripciones"
         just_a_few_more_steps: 'Solo unos pocos pasos más antes de que pueda comenzar:'
         enable_subscriptions: "Habilita suscripciones para al menos una de tus tiendas"
         enable_subscriptions_step_1_html: 1. Vaya a la página %{enterprises_link}, encuentre su tienda y haga clic en "Administrar"
@@ -1063,6 +1067,8 @@ es:
         create_at_least_one_schedule_step_3: 3. Haga clic en '+ Nueva programación' y complete el formulario
         once_you_are_done_you_can_html: Una vez que haya terminado, puede %{reload_this_page_link}
         reload_this_page: recarga esta página
+      form:
+        create: "Crear suscripción"
       steps:
         details: 1. Detalles básicos
         address: 2. Dirección
@@ -3353,6 +3359,27 @@ es:
       invoice_email:
         hi: "Hola %{name}"
         invoice_attached_text: Adjunta una factura para su pedido reciente de
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            Se ha solicitado el cambio de tu contraseña.
+            Si tu no lo has solicitado simplemente ignora este email.
+        link_text: >
+            Si has solicitado esta acción haz click en el siguiente enlace:
+        issue_text: |
+            Si el enlace no funciona prueba a copiarlo y pegarlo en tu navegador.
+            Si los problemas continúan no dudes en contactarnos.
+      confirmation_instructions:
+        subject: "Por favor, confirma tu cuenta de OFN"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Estimada consumidora,"
+        instructions: "Tu pedido ha sido enviado"
+        shipment_summary: "Resumen de envío"
+        subject: "Notificación de envío"
+        thanks: "Gracias por hacer negocios."
+        track_information: "Información de seguimiento: %{tracking}"
+        track_link: "Enlace de seguimiento: %{url}"
     order_state:
       address: dirección
       adjustments: ajustes
@@ -3374,18 +3401,6 @@ es:
       ended: terminado
       paused: pausado
       canceled: cancelado
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            Se ha solicitado el cambio de tu contraseña.
-            Si tu no lo has solicitado simplemente ignora este email.
-        link_text: >
-            Si has solicitado esta acción haz click en el siguiente enlace:
-        issue_text: |
-            Si el enlace no funciona prueba a copiarlo y pegarlo en tu navegador.
-            Si los problemas continúan no dudes en contactarnos.
-      confirmation_instructions:
-        subject: Por favor, confirma tu cuenta de OFN
     users:
       form:
         account_settings: Configuración de la cuenta

config/locales/es_CR.yml

@@ -1030,10 +1030,13 @@ es_CR:
         name: "Resumen de las comisiones de la organización"
         description: "Resumen de las comisiones de la organización recolectadas"
     subscriptions:
-      subscriptions: Suscripciones
-      new: Nueva suscripción
-      create: Crear suscripción
-      edit: Editar suscripción
+      index:
+        title: "Suscripciones"
+        new: "Nueva suscripción"
+      new:
+        title: "Nueva suscripción"
+      edit:
+        title: "Editar suscripción"
       table:
         edit_subscription: Editar suscripción
         pause_subscription: Pausar suscripción
@@ -1042,6 +1045,7 @@ es_CR:
       filters:
         query_placeholder: "Buscar por correo electrónico ..."
       setup_explanation:
+        title: "Suscripciones"
         just_a_few_more_steps: 'Solo unos pocos pasos más antes de que pueda comenzar:'
         enable_subscriptions: "Habilita suscripciones para al menos una de sus tiendas"
         enable_subscriptions_step_1_html: 1. Ir a la página %{enterprises_link}, encuentre su tienda y haga clic en "Administrar"
@@ -1055,6 +1059,8 @@ es_CR:
         create_at_least_one_schedule_step_3: 3. Haga clic en '+ Nueva programación' y complete el formulario
         once_you_are_done_you_can_html: Una vez que haya terminado, puede %{reload_this_page_link}
         reload_this_page: recarga esta página
+      form:
+        create: "Crear suscripción"
       steps:
         details: 1. Detalles básicos
         address: 2. Dirección
@@ -3287,6 +3293,27 @@ es_CR:
       invoice_email:
         hi: "Hola %{name}"
         invoice_attached_text: Adjunta una factura para su pedido reciente de
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            La solicitud de restablecer su contraseña se ha realizado.
+            Si usted no lo ha solicitado, ignora este correo electrónico.
+        link_text: >
+            Si has solicitado esta acción haz click en el siguiente enlace:
+        issue_text: |
+            Si el enlace anterior no funciona pruebe con copiarlo y pegarlo en su navegador.
+            Si los problemas continúan no dude en contactarnos.
+      confirmation_instructions:
+        subject: "Por favor, confirma tu cuenta de OFN"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Estimado cliente,"
+        instructions: "Su pedido ha sido enviado"
+        shipment_summary: "Resumen de envío"
+        subject: "Notificación de envío"
+        thanks: "Gracias por su negocio."
+        track_information: "Información de seguimiento: %{tracking}"
+        track_link: "Enlace de seguimiento: %{url}"
     order_state:
       address: dirección
       adjustments: ajustes
@@ -3308,18 +3335,6 @@ es_CR:
       ended: terminado
       paused: pausado
       canceled: cancelado
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            La solicitud de restablecer su contraseña se ha realizado.
-            Si usted no lo ha solicitado, ignora este correo electrónico.
-        link_text: >
-            Si has solicitado esta acción haz click en el siguiente enlace:
-        issue_text: |
-            Si el enlace anterior no funciona pruebe con copiarlo y pegarlo en su navegador.
-            Si los problemas continúan no dude en contactarnos.
-      confirmation_instructions:
-        subject: Por favor, confirma tu cuenta de OFN
     users:
       form:
         account_settings: Configuración de la cuenta

config/locales/fil_PH.yml

@@ -1030,10 +1030,13 @@ fil_PH:
         name: "buod ng bayad sa enterprise"
         description: "buod ng mga nakolektang fees para sa enterprise"
     subscriptions:
-      subscriptions: mga subscription
-      new: bagong subscription
-      create: gumawa ng subscription
-      edit: i-edit ang subscription
+      index:
+        title: "mga nauulit na order"
+        new: "bagong subscription"
+      new:
+        title: "bagong subscription"
+      edit:
+        title: "i-edit ang subscription"
       table:
         edit_subscription: i-edit ang subscription
         pause_subscription: panandaliang ihinto ang subscription
@@ -1042,6 +1045,7 @@ fil_PH:
       filters:
         query_placeholder: "hanapin gamit ang email..."
       setup_explanation:
+        title: "mga nauulit na order"
         just_a_few_more_steps: 'ilang hakbang na lamang bago ka makapagsimula:'
         enable_subscriptions: "paganahin ang subscription sa kahit isa sa iyong mga shop"
         enable_subscriptions_step_1_html: 1. pumunta sa%{enterprises_link}pahina, hanapin ang iyong shop at pindutin ang "pamahalaan"
@@ -1055,6 +1059,8 @@ fil_PH:
         create_at_least_one_schedule_step_3: 3. pindutin ang '+ bagong iskedyul' at sagutan ang form
         once_you_are_done_you_can_html: kapag natapos na ito, maaari mong%{reload_this_page_link}
         reload_this_page: i-reload ang pahina na ito
+      form:
+        create: "gumawa ng subscription"
       steps:
         details: 1. pangunahing detalye
         address: 2. address
@@ -3292,6 +3298,27 @@ fil_PH:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: 'tignan ang nakalakip na invoice para sa pinakabagong order mula sa  '
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            may ginawang request para i-reset ang inyong password.
+            kung hindi ikaw ang gumawa nito, huwag pansinin ang email na ito.
+        link_text: >
+            kung ikaw ang gumawa ng request na ito, pindutin ang link sa ilalim:
+        issue_text: |
+            kung ang URL sa itaas ay hindi gumagana, subukang kopyahin at i-paste ito sa inyong browser.
+            kung patuloy na magkakaroon ng mga problema, huwag mag-atubiling makipag-ugnayan sa amin.
+      confirmation_instructions:
+        subject: "kumpirmahin ang inyong OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "ang iyong order ay na-ship na "
+        shipment_summary: "buod ng kargamento"
+        subject: "notification ukol sa kargamento"
+        thanks: "Salamat sa inyong pagtangkilik"
+        track_information: "Impormasyon ukol sa pag-track: %{tracking}"
+        track_link: "Link ng pag-track:%{url}"
     order_state:
       address: tirahan
       adjustments: mga pagsasaayos
@@ -3313,18 +3340,6 @@ fil_PH:
       ended: natapos na
       paused: nakahinto
       canceled: kanselado
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            may ginawang request para i-reset ang inyong password.
-            kung hindi ikaw ang gumawa nito, huwag pansinin ang email na ito.
-        link_text: >
-            kung ikaw ang gumawa ng request na ito, pindutin ang link sa ilalim:
-        issue_text: |
-            kung ang URL sa itaas ay hindi gumagana, subukang kopyahin at i-paste ito sa inyong browser.
-            kung patuloy na magkakaroon ng mga problema, huwag mag-atubiling makipag-ugnayan sa amin.
-      confirmation_instructions:
-        subject: kumpirmahin ang inyong OFN account
     users:
       form:
         account_settings: Setting ng Account

config/locales/fr_BE.yml

@@ -1029,10 +1029,13 @@ fr_BE:
         name: "Récapitulatif de la commission d'entreprise "
         description: "Récapitulatif des commissions d'entreprise perçues"
     subscriptions:
-      subscriptions: Abonnements
-      new: Nouvel abonnement
-      create: Créer abonnement
-      edit: Mettre à jour Abonnement
+      index:
+        title: "commandes récurrantes"
+        new: "Nouvel abonnement"
+      new:
+        title: "Nouvel abonnement"
+      edit:
+        title: "Mettre à jour Abonnement"
       table:
         edit_subscription: Mettre à jour Abonnement
         pause_subscription: Mettre en pause Abonnement
@@ -1041,6 +1044,7 @@ fr_BE:
       filters:
         query_placeholder: "Recherche par email ..."
       setup_explanation:
+        title: "commandes récurrantes"
         just_a_few_more_steps: 'Encore quelques étapes avant de pouvoir commencer:'
         enable_subscriptions: "Activez la fonction abonnements pour au moins une de vos comptoirs"
         enable_subscriptions_step_1_html: 1. Allez à %{enterprises_link}, trouvez votre comptoir, et cliquez sur "Gérer"
@@ -1054,6 +1058,8 @@ fr_BE:
         create_at_least_one_schedule_step_3: 3. Cliquez sur "+ Nouveau Rythme d'abonnement", et remplissez le formulaire
         once_you_are_done_you_can_html: Une fois que c'est fait, vous pouvez %{reload_this_page_link}
         reload_this_page: recharger cette page
+      form:
+        create: "Créer abonnement"
       steps:
         details: 1. Informations de base
         address: 2. Adresse
@@ -3230,6 +3236,28 @@ fr_BE:
       invoice_email:
         hi: "Bonjour %{name}"
         invoice_attached_text: 'Veuillez trouver ci-joint la facture pour votre récente commande auprès de '
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            Votre demande de nouveau mot de passe a bien été prise en compte.
+            Si vous n'avez pas demandé de nouveau mot de passe, veuillez ignorer cet e-mail.
+        link_text: >
+            Si vous êtes bien à l'origine de cette demande, veuillez cliquer sur le
+            lien ci-dessous :
+        issue_text: |
+            Si le lien ne fonctionne pas, essayez de le copier - coller dans la barre d'adresse de votre navigateur.
+            Si le problème persiste, n'hésitez pas à nous contacter.
+      confirmation_instructions:
+        subject: "Veuillez confirmer votre compte"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Cher Client,"
+        instructions: "Votre commande a été expédiée"
+        shipment_summary: "Résumé de l'envoi"
+        subject: "Notification d'expédition"
+        thanks: "Merci pour votre commande."
+        track_information: "Informations de suivi : %{tracking}"
+        track_link: "Lien de suivi : %{url}"
     order_state:
       address: adresse
       adjustments: ajustements
@@ -3251,19 +3279,6 @@ fr_BE:
       ended: terminé
       paused: mis en pause
       canceled: annulé
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            Votre demande de nouveau mot de passe a bien été prise en compte.
-            Si vous n'avez pas demandé de nouveau mot de passe, veuillez ignorer cet e-mail.
-        link_text: >
-            Si vous êtes bien à l'origine de cette demande, veuillez cliquer sur le
-            lien ci-dessous :
-        issue_text: |
-            Si le lien ne fonctionne pas, essayez de le copier - coller dans la barre d'adresse de votre navigateur.
-            Si le problème persiste, n'hésitez pas à nous contacter.
-      confirmation_instructions:
-        subject: Veuillez confirmer votre compte
     users:
       form:
         account_settings: Paramètres du Compte

config/locales/fr_CA.yml

@@ -1038,10 +1038,13 @@ fr_CA:
         name: "Résumé des marges et commissions"
         description: "Résumé des marges et commissions collectées"
     subscriptions:
-      subscriptions: Abonnements
-      new: Nouvel abonnement
-      create: Créer abonnement
-      edit: Mettre à jour Abonnement
+      index:
+        title: "Abonnements"
+        new: "Nouvel abonnement"
+      new:
+        title: "Nouvel abonnement"
+      edit:
+        title: "Mettre à jour Abonnement"
       table:
         edit_subscription: Mettre à jour Abonnement
         pause_subscription: Mettre en pause Abonnement
@@ -1050,6 +1053,7 @@ fr_CA:
       filters:
         query_placeholder: "Recherche par email"
       setup_explanation:
+        title: "Abonnements"
         just_a_few_more_steps: 'Encore quelques étapes avant de pouvoir commencer:'
         enable_subscriptions: "Activez la fonction abonnements pour au moins une de vos boutiques"
         enable_subscriptions_step_1_html: 1. Allez à %{enterprises_link}, trouvez votre boutique, et cliquez sur "Gérer"
@@ -1063,6 +1067,8 @@ fr_CA:
         create_at_least_one_schedule_step_3: 3. Cliquez sur "+ Nouveau Rythme d'abonnement", et remplissez le formulaire
         once_you_are_done_you_can_html: Une fois que c'est fait, vous pouvez %{reload_this_page_link}
         reload_this_page: recharger cette page
+      form:
+        create: "Créer abonnement"
       steps:
         details: 1. Informations de base
         address: 2. Adresse
@@ -3359,6 +3365,28 @@ fr_CA:
       invoice_email:
         hi: "Bonjour %{name}"
         invoice_attached_text: 'Veuillez trouver ci-joint la facture pour votre récente commande auprès de '
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            Votre demande de nouveau mot de passe a bien été prise en compte.
+            Si vous n'avez pas demandé de nouveau mot de passe, veuillez ignorer cet e-mail.
+        link_text: >
+            Si vous êtes bien à l'origine de cette demande, veuillez cliquer sur le
+            lien ci-dessous :
+        issue_text: |
+            Si le lien ne fonctionne pas, essayez de le copier - coller dans la barre d'adresse de votre navigateur.
+            Si le problème persiste, n'hésitez pas à nous contacter.
+      confirmation_instructions:
+        subject: "Veuillez confirmer votre compte"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Cher Acheteur,"
+        instructions: "Votre commande a été expédiée"
+        shipment_summary: "Résumé de l'envoi"
+        subject: "Notification d'expédition"
+        thanks: "Merci pour votre commande."
+        track_information: "Informations de suivi :%{tracking}"
+        track_link: "Lien de suivi :%{url}"
     order_state:
       address: adresse
       adjustments: ajustements
@@ -3380,19 +3408,6 @@ fr_CA:
       ended: terminé
       paused: mis en pause
       canceled: annulé
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            Votre demande de nouveau mot de passe a bien été prise en compte.
-            Si vous n'avez pas demandé de nouveau mot de passe, veuillez ignorer cet e-mail.
-        link_text: >
-            Si vous êtes bien à l'origine de cette demande, veuillez cliquer sur le
-            lien ci-dessous :
-        issue_text: |
-            Si le lien ne fonctionne pas, essayez de le copier - coller dans la barre d'adresse de votre navigateur.
-            Si le problème persiste, n'hésitez pas à nous contacter.
-      confirmation_instructions:
-        subject: Veuillez confirmer votre compte
     users:
       form:
         account_settings: Paramètres du Compte

config/locales/it.yml

@@ -1037,10 +1037,13 @@ it:
         name: "Riepilogo commissioni dell'azienda"
         description: "Riepilogo delle commissioni dell'azienda"
     subscriptions:
-      subscriptions: Abbonamenti
-      new: Nuovo Abbonamento
-      create: Crea Abbonamento
-      edit: Modifica Abbonamento
+      index:
+        title: "Abbonamenti"
+        new: "Nuovo Abbonamento"
+      new:
+        title: "Nuovo Abbonamento"
+      edit:
+        title: "Modifica Abbonamento"
       table:
         edit_subscription: Modifica Abbonamento
         pause_subscription: Metti in pausa l'abbonamento
@@ -1049,6 +1052,7 @@ it:
       filters:
         query_placeholder: "Cerca per email..."
       setup_explanation:
+        title: "Abbonamenti"
         just_a_few_more_steps: 'Ancora pochi passi prima di cominciare:'
         enable_subscriptions: "Ativa abbonamento ad almeno uno dei tuoi negozi"
         enable_subscriptions_step_1_html: 1. Vai alla pagina %{enterprises_link}, trova il tuo negozio e clicca "Gestisci"
@@ -1062,6 +1066,8 @@ it:
         create_at_least_one_schedule_step_3: '3. Clicca su"+ Nuovo programma" e compila il modulo '
         once_you_are_done_you_can_html: Quando hai fatto, puoi %{reload_this_page_link}
         reload_this_page: Ricarica questa pagina
+      form:
+        create: "Crea Abbonamento"
       steps:
         details: 1. Dettagli base
         address: 2. Indirizzo
@@ -3350,6 +3356,27 @@ it:
       invoice_email:
         hi: "Ciao %{name}"
         invoice_attached_text: 'Aggiunge una fattura per il tuo recente ordine di '
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            E' stata fatta una richiesta per resettare la tua password
+            Se non hai fatto questa richiesta, ignora semplicemente questa email.
+        link_text: >
+            Se hai fatto questa richiesta, clicca il link seguente:
+        issue_text: |
+            Se l'URL qui sopra non funziona, prova a copiarlo e incollarlo nel tuo browser.
+            Se continui ad avere problemi, contattaci.
+      confirmation_instructions:
+        subject: "Per favore conferma il tuo account OFN"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Caro Cliente,"
+        instructions: "Il tuo ordine è stato spedito"
+        shipment_summary: "Riepilogo della Spedizione"
+        subject: "Notifica di Spedizione"
+        thanks: "Grazie per il tuo lavoro."
+        track_information: "Informazioni Tracking: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: indirizzo
       adjustments: aggiustamenti
@@ -3371,18 +3398,6 @@ it:
       ended: finito
       paused: in pausa
       canceled: annullato
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            E' stata fatta una richiesta per resettare la tua password
-            Se non hai fatto questa richiesta, ignora semplicemente questa email.
-        link_text: >
-            Se hai fatto questa richiesta, clicca il link seguente:
-        issue_text: |
-            Se l'URL qui sopra non funziona, prova a copiarlo e incollarlo nel tuo browser.
-            Se continui ad avere problemi, contattaci.
-      confirmation_instructions:
-        subject: Per favore conferma il tuo account OFN
     users:
       form:
         account_settings: Impostazioni account

config/locales/nb.yml

@@ -1034,10 +1034,13 @@ nb:
         name: "Sammendrag Bedriftsavgift"
         description: "Sammendrag av bedriftsavgifter innsamlet"
     subscriptions:
-      subscriptions: Abonnement
-      new: Nytt abonnement
-      create: Opprett abonnement
-      edit: Rediger abonnement
+      index:
+        title: "Abonnement"
+        new: "Nytt abonnement"
+      new:
+        title: "Nytt abonnement"
+      edit:
+        title: "Rediger abonnement"
       table:
         edit_subscription: Rediger abonnement
         pause_subscription: Pause abonnement
@@ -1046,6 +1049,7 @@ nb:
       filters:
         query_placeholder: "Søk på epost..."
       setup_explanation:
+        title: "Abonnement"
         just_a_few_more_steps: 'Bare noen få skritt før du kan begynne:'
         enable_subscriptions: "Aktiver abonnementer for minst en av butikkene dine"
         enable_subscriptions_step_1_html: 1. Gå til siden %{enterprises_link}, finn butikken din, og klikk på "Endre profil"
@@ -1059,6 +1063,8 @@ nb:
         create_at_least_one_schedule_step_3: 3. Klikk på '+ Ny tidsplan', og fyll ut skjemaet
         once_you_are_done_you_can_html: Når du er ferdig, kan du %{reload_this_page_link}
         reload_this_page: oppdater denne siden
+      form:
+        create: "Opprett abonnement"
       steps:
         details: 1. Grunnleggende detaljer
         address: 2. Adresse
@@ -3341,6 +3347,27 @@ nb:
       invoice_email:
         hi: "Hei %{name}"
         invoice_attached_text: Vennligst finn vedlagt en faktura for din nylige bestilling fra
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            En forespørsel om å nullstille ditt passord er utført.
+            Hvis det ikke var du som forespurte dette kan du se bort i fra denne eposten.
+        link_text: >
+            Hvis det var du som forespurte dette kan du klikke nedenfor:
+        issue_text: |
+            Hvis URL'en ovenfor ikke fungerer prøv å kopier og lim den inn i din nettleser.
+            Hvis du fortsatt har problemer vennligst ta kontakt.
+      confirmation_instructions:
+        subject: "Vennligst bekreft OFN-kontoen din"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Kjære Kunde,"
+        instructions: "Din bestilling har blitt sendt"
+        shipment_summary: "Leveringssammendrag"
+        subject: "Leveringsvarsling"
+        thanks: "Takk for handelen."
+        track_information: "Sporingsinformasjon: %{tracking}"
+        track_link: "Sporingslink: %{url}"
     order_state:
       address: adresse
       adjustments: justeringer
@@ -3362,18 +3389,6 @@ nb:
       ended: avsluttet
       paused: pauset
       canceled: avbrutt
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            En forespørsel om å nullstille ditt passord er utført.
-            Hvis det ikke var du som forespurte dette kan du se bort i fra denne eposten.
-        link_text: >
-            Hvis det var du som forespurte dette kan du klikke nedenfor:
-        issue_text: |
-            Hvis URL'en ovenfor ikke fungerer prøv å kopier og lim den inn i din nettleser.
-            Hvis du fortsatt har problemer vennligst ta kontakt.
-      confirmation_instructions:
-        subject: Vennligst bekreft OFN-kontoen din
     users:
       form:
         account_settings: Kontoinnstillinger

config/locales/nl_BE.yml

@@ -994,10 +994,13 @@ nl_BE:
         name: "Samenvatting van de honoraria voor ondernemingen"
         description: "Overzicht van de geïnde ondernemingsvergoedingen"
     subscriptions:
-      subscriptions: Abonnementen
-      new: Nieuw abonnement
-      create: Abonnement aanmaken
-      edit: Abonnement bewerken
+      index:
+        title: "Abonnementen"
+        new: "Nieuw abonnement"
+      new:
+        title: "Nieuw abonnement"
+      edit:
+        title: "Abonnement bewerken"
       table:
         edit_subscription: Abonnement bewerken
         pause_subscription: Pauze Abonnement
@@ -1006,6 +1009,7 @@ nl_BE:
       filters:
         query_placeholder: "Zoeken per e-mail ..."
       setup_explanation:
+        title: "Abonnementen"
         just_a_few_more_steps: 'Nog een paar stappen voordat u kunt beginnen:'
         enable_subscriptions: "Inschrijven voor minstens één van uw winkels mogelijk maken"
         enable_subscriptions_step_1_html: 1. Ga naar de %{enterprises_link}pagina, vind uw winkel en klik op "Beheren".
@@ -1019,6 +1023,8 @@ nl_BE:
         create_at_least_one_schedule_step_3: 3. Klik '+ Nieuwe Planning', en vul een formulier in
         once_you_are_done_you_can_html: Eens je klaar bent, kan je %{reload_this_page_link}
         reload_this_page: herlaad deze pagina
+      form:
+        create: "Abonnement aanmaken"
       steps:
         details: 1. Basis Specificaties
         address: 2. Adres
@@ -3105,6 +3111,28 @@ nl_BE:
       invoice_email:
         hi: "Hallo %{name}"
         invoice_attached_text: 'Gelieve hier de factuur te vinden in veband met de laatste bestelling geplaatst bij '
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            Uw aanvraag voor een nieuww paswoord is in acht genomen
+            Indien je geen nieuw paswoord aangevraagd heeft, gelieve hiermee geen rekening te houden.
+        link_text: >
+            Indien U wel de aanvraag gedaan hebt, gelieve op de link hieronder te
+            klikken :
+        issue_text: |
+            Indien de link niet functioneert, gelieve die te copiëren-plakken in het adresstrook van uw navigator.
+            Moest het probleem blijven duren, aarzel niet ons te contacteren
+      confirmation_instructions:
+        subject: "Gelieve uw OFN rekening te bevestigen"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Geachte klant,"
+        instructions: "Uw bestelling is verzonden"
+        shipment_summary: "Samenvatting van de zending"
+        subject: "Kennisgeving van verzending"
+        thanks: "Bedankt voor uw bedrijf."
+        track_information: "Tracking informatie: %{tracking}"
+        track_link: "Tracking Link:%{url} "
     order_state:
       address: adres
       adjustments: aanpassingen
@@ -3126,19 +3154,6 @@ nl_BE:
       ended: ten einde gebracht
       paused: 'in pause '
       canceled: geschrapt
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            Uw aanvraag voor een nieuww paswoord is in acht genomen
-            Indien je geen nieuw paswoord aangevraagd heeft, gelieve hiermee geen rekening te houden.
-        link_text: >
-            Indien U wel de aanvraag gedaan hebt, gelieve op de link hieronder te
-            klikken :
-        issue_text: |
-            Indien de link niet functioneert, gelieve die te copiëren-plakken in het adresstrook van uw navigator.
-            Moest het probleem blijven duren, aarzel niet ons te contacteren
-      confirmation_instructions:
-        subject: Gelieve uw OFN rekening te bevestigen
     users:
       form:
         account_settings: Rekeningsinstellingen

config/locales/pt.yml

@@ -979,16 +979,20 @@ pt:
         name: "Sumário das Taxas de Organização"
         description: "Sumário das Taxas de Organização cobradas"
     subscriptions:
-      subscriptions: Subscrições
-      new: Nova Subscrição
-      create: Criar Subscrição
-      edit: Editar Subscrição
+      index:
+        title: "Subscrições"
+        new: "Nova Subscrição"
+      new:
+        title: "Nova Subscrição"
+      edit:
+        title: "Editar Subscrição"
       table:
         edit_subscription: Editar Subscrição
         pause_subscription: Pausar Subscrição
         unpause_subscription: Parar pausa da Subscrição
         cancel_subscription: Cancelar Subscrição
       setup_explanation:
+        title: "Subscrições"
         just_a_few_more_steps: 'Só mais uns passos antes de poder começar:'
         enable_subscriptions: "Activar subscrições para pelo menos uma das suas lojas"
         enable_subscriptions_step_1_html: 1. Vá à página %{enterprises_link}, encontre a sua loja, e clique em "Gerir"
@@ -1002,6 +1006,8 @@ pt:
         create_at_least_one_schedule_step_3: 3. Clique em '+ Novo Horário', e preencha o formulário
         once_you_are_done_you_can_html: Assim que estiver feito, pode %{reload_this_page_link}
         reload_this_page: carregar de novo esta página
+      form:
+        create: "Criar Subscrição"
       steps:
         details: 1. Detalhes Básicos
         address: 2. Morada
@@ -3041,6 +3047,26 @@ pt:
       invoice_email:
         hi: "Olá %{name}"
         invoice_attached_text: Pode encontrar em anexo um recibo da encomenda que fez recentemente a
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            Recebemos um pedido para redefinir a sua palavra-passe.
+            Se não fez este pedido, simplesmente ignore esta mensagem.
+        link_text: >
+            Se fez este pedido, clique no link abaixo:
+        issue_text: |
+            Se o endereço URL acima não funcionar, tente copiá-lo e colá-lo directamente no browser. Se continuar a ter problemas por favor entre em contacto connosco.
+      confirmation_instructions:
+        subject: "Por favor confirme a sua conta OFN"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Caro Consumidor,"
+        instructions: "A sua encomenda foi enviada"
+        shipment_summary: "Sumário de Envio"
+        subject: "Notificação de Envio"
+        thanks: "Obrigado."
+        track_information: "Informação de envio: %{tracking}"
+        track_link: "Link de envio: %{url}"
     order_state:
       address: morada
       adjustments: ajustes
@@ -3062,17 +3088,6 @@ pt:
       ended: terminou
       paused: em pausa
       canceled: cancelado
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            Recebemos um pedido para redefinir a sua palavra-passe.
-            Se não fez este pedido, simplesmente ignore esta mensagem.
-        link_text: >
-            Se fez este pedido, clique no link abaixo:
-        issue_text: |
-            Se o endereço URL acima não funcionar, tente copiá-lo e colá-lo directamente no browser. Se continuar a ter problemas por favor entre em contacto connosco.
-      confirmation_instructions:
-        subject: Por favor confirme a sua conta OFN
     users:
       form:
         account_settings: Definições de Conta

config/locales/pt_BR.yml

@@ -1034,10 +1034,10 @@ pt_BR:
         name: "Resumo das taxas da empresa"
         description: "Resumo das taxas corporativas coletadas"
     subscriptions:
-      subscriptions: Assinaturas
-      new: Nova assinatura
-      create: Criar assinatura
-      edit: Editar assinatura
+      index:
+        title: "Assinaturas"
+      edit:
+        title: "Editar assinatura"
       table:
         edit_subscription: Editar assinatura
         pause_subscription: Pausar assinatura
@@ -1046,6 +1046,7 @@ pt_BR:
       filters:
         query_placeholder: "Pesquisar por email ..."
       setup_explanation:
+        title: "Assinaturas"
         just_a_few_more_steps: 'Apenas mais algumas etapas antes de começar:'
         enable_subscriptions: "Ative assinaturas para pelo menos uma de suas lojas"
         enable_subscriptions_step_1_html: '1. Vá para a página %{enterprises_link}, encontre sua loja e clique em "Gerenciar" '
@@ -3349,6 +3350,27 @@ pt_BR:
       invoice_email:
         hi: "Oi %{name}"
         invoice_attached_text: Encontre anexa uma fatura para sua recente ordem de
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            Foi feito um pedido para redefinir sua senha.
+            Se você não fez essa solicitação, simplesmente ignore este e-mail.
+        link_text: >
+            Se você fez esse pedido, basta clicar no link abaixo:
+        issue_text: |
+            Se o URL acima não funcionar, tente copiar e colá-lo em seu navegador.
+            Se continuar a ter problemas, por favor não hesite em contactar-nos.
+      confirmation_instructions:
+        subject: "Confirme sua conta na OFB"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Estimado cliente,"
+        instructions: "Seu pedido foi enviado"
+        shipment_summary: "Resumo de Envio"
+        subject: "Notificação de envio"
+        thanks: "Agradeço pelos seus serviços."
+        track_information: "Informações de rastreamento: %{tracking}"
+        track_link: "Link de rastreamento: %{url}"
     order_state:
       address: endereço
       adjustments: ajustes
@@ -3370,18 +3392,6 @@ pt_BR:
       ended: finalizado
       paused: pausado
       canceled: cancelado
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            Foi feito um pedido para redefinir sua senha.
-            Se você não fez essa solicitação, simplesmente ignore este e-mail.
-        link_text: >
-            Se você fez esse pedido, basta clicar no link abaixo:
-        issue_text: |
-            Se o URL acima não funcionar, tente copiar e colá-lo em seu navegador.
-            Se continuar a ter problemas, por favor não hesite em contactar-nos.
-      confirmation_instructions:
-        subject: Confirme sua conta na OFB
     users:
       form:
         account_settings: Configurações da conta

config/locales/sv.yml

@@ -2108,6 +2108,16 @@ sv:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Här är en faktura för din senaste order från
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            En begäran om att återställa ditt lösenord har gjorts.
+            Om du inte gjorde denna förfrågan ignorerar du bara det här e-postmeddelandet.
+        link_text: >
+            Om du gjorde denna förfrågan klickar du bara på länken nedan:
+        issue_text: |
+            Om den ovan nämnda webbadressen inte fungerar kan du försöka kopiera och klistra in den i webbläsaren.
+            Om du får problem, var god kontakta oss.
     order_state:
       address: adress
       adjustments: justeringar
@@ -2120,16 +2130,6 @@ sv:
       resumed: återupptagen
       returned: returnerad
       skrill: skrill
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            En begäran om att återställa ditt lösenord har gjorts.
-            Om du inte gjorde denna förfrågan ignorerar du bara det här e-postmeddelandet.
-        link_text: >
-            Om du gjorde denna förfrågan klickar du bara på länken nedan:
-        issue_text: |
-            Om den ovan nämnda webbadressen inte fungerar kan du försöka kopiera och klistra in den i webbläsaren.
-            Om du får problem, var god kontakta oss.
     users:
       open_orders:
         order: Beställningar

config/locales/tr.yml

@@ -1036,10 +1036,13 @@ tr:
         name: "İşletme Ücreti Özeti"
         description: "Toplanan İşletme Ücretlerinin Özeti"
     subscriptions:
-      subscriptions: Üyelikler
-      new: Yeni Üyelik
-      create: Üyelik Oluştur
-      edit: Üyeliği düzenle
+      index:
+        title: "Üyelikler"
+        new: "Yeni Üyelik"
+      new:
+        title: "Yeni Üyelik"
+      edit:
+        title: "Üyeliği Düzenle"
       table:
         edit_subscription: Üyeliği Düzenle
         pause_subscription: Üyeliği Duraklat
@@ -1048,6 +1051,7 @@ tr:
       filters:
         query_placeholder: "E-posta ile ara ..."
       setup_explanation:
+        title: "Üyelikler"
         just_a_few_more_steps: 'Başlamadan önce birkaç adım kaldı:'
         enable_subscriptions: "Dükkanınızdan en az biri için üyelikleri etkinleştirin"
         enable_subscriptions_step_1_html: 1. %{enterprises_link} sayfasına gidin, dükkanınızı bulun ve ‘Yönet’i tıklayın
@@ -1061,6 +1065,8 @@ tr:
         create_at_least_one_schedule_step_3: 3. 'Yeni Takvim' butonuna tıklayın ve formu doldurun
         once_you_are_done_you_can_html: 'İşiniz bittiğinde, %{reload_this_page_link} '
         reload_this_page: Sayfayı yeniden yükle
+      form:
+        create: "Üyelik Oluştur"
       steps:
         details: 1. Temel Bilgiler
         address: 2. Adres
@@ -3349,6 +3355,27 @@ tr:
       invoice_email:
         hi: "Merhaba %{name}"
         invoice_attached_text: 'Son siparişiniz için gelen fatura ektedir:'
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            Şifrenizin değiştirilmesi için bir talepte bulunuldu.
+            Eğer talepte bulunan siz değilseniz lütfen bu mesajı gözardı edin.
+        link_text: >
+            Bu talepte bulunduysanız lütfen aşağıdaki bağlantıya tıklayın:
+        issue_text: |
+            Üstteki URL çalışmıyor ise tarayıcınızın adres çubuğuna kopyalayıp yapıştırmayı deneyebilirsiniz.
+            Sorun yaşamaya devam ederseniz bizimle iletişime geçmekten çekinmeyin.
+      confirmation_instructions:
+        subject: "Lütfen AGA hesabınızı onaylayın"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Değerli müşterimiz,"
+        instructions: "Siparişiniz gönderildi"
+        shipment_summary: "Teslimat Özeti"
+        subject: "TESLİMAT BİLDİRİMİ"
+        thanks: "İş birliğiniz için teşekkür ederim."
+        track_information: "Takip Bilgileri: %{tracking}"
+        track_link: "Takip Bağlantısı: %{url}"
     order_state:
       address: adres
       adjustments: düzenlemeler
@@ -3370,18 +3397,6 @@ tr:
       ended: bitti
       paused: durduruldu
       canceled: iptal edildi
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            Şifrenizin değiştirilmesi için bir talepte bulunuldu.
-            Eğer talepte bulunan siz değilseniz lütfen bu mesajı gözardı edin.
-        link_text: >
-            Bu talepte bulunduysanız lütfen aşağıdaki bağlantıya tıklayın:
-        issue_text: |
-            Üstteki URL çalışmıyor ise tarayıcınızın adres çubuğuna kopyalayıp yapıştırmayı deneyebilirsiniz.
-            Sorun yaşamaya devam ederseniz bizimle iletişime geçmekten çekinmeyin.
-      confirmation_instructions:
-        subject: Lütfen AGA hesabınızı onaylayın
     users:
       form:
         account_settings: Hesap Ayarları