diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 757c233491..520269cb51 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -700,9 +700,6 @@ ca:
           enable_subscriptions_false: "Deshabilitat"
           enable_subscriptions_true: "Habilitat"
           shopfront_message: "Missatge de la botiga"
-          shopfront_message_placeholder: >
-              Una explicació opcional per a les consumidores que detalla com funciona
-              la vostra botiga, que es mostrarà a sobre de la llista de productes.
           shopfront_message_link_tooltip: "Inserir / editar enllaç"
           shopfront_message_link_prompt: "Introduïu un URL per inserir"
           shopfront_closed_message: "Missatge de tancament de la botiga"
@@ -2644,6 +2641,7 @@ ca:
   status: "estat"
   new: "Nou"
   start: "Començar"
+  end: "Acabar"
   stop: "Aturar"
   first: "Primer"
   previous: "Anterior"
diff --git a/config/locales/de_DE.yml b/config/locales/de_DE.yml
index dff2b0e7a8..62afda559e 100644
--- a/config/locales/de_DE.yml
+++ b/config/locales/de_DE.yml
@@ -700,10 +700,6 @@ de_DE:
           enable_subscriptions_false: "deaktiviert"
           enable_subscriptions_true: "aktiviert"
           shopfront_message: "Laden-Nachricht"
-          shopfront_message_placeholder: >
-              Eine optionale Erklärung für Kunden, die detailliert beschreibt, wie
-              Ihr Laden funktioniert, wird oberhalb der Produktliste auf Ihrer Laden-Seite
-              angezeigt.
           shopfront_message_link_tooltip: "Link einfügen / bearbeiten"
           shopfront_message_link_prompt: "Bitte geben Sie eine einzufügende URL ein"
           shopfront_closed_message: "Laden Geschlossen Nachricht"
diff --git a/config/locales/en_AU.yml b/config/locales/en_AU.yml
index a7c27435ff..af248a924c 100644
--- a/config/locales/en_AU.yml
+++ b/config/locales/en_AU.yml
@@ -699,9 +699,6 @@ en_AU:
           enable_subscriptions_false: "Disabled"
           enable_subscriptions_true: "Enabled"
           shopfront_message: "Shopfront Message"
-          shopfront_message_placeholder: >
-              An optional explanation for customers detailing how your shopfront works,
-              to be displayed above the product list on your shop page.
           shopfront_message_link_tooltip: "Insert / edit link"
           shopfront_message_link_prompt: "Please enter a URL to insert"
           shopfront_closed_message: "Shopfront Closed Message"
@@ -2639,6 +2636,7 @@ en_AU:
   status: "status"
   new: "New"
   start: "Start"
+  end: "End"
   stop: "Stop"
   first: "First"
   previous: "Previous"
diff --git a/config/locales/en_BE.yml b/config/locales/en_BE.yml
index 1d8539ed7a..7757ac6641 100644
--- a/config/locales/en_BE.yml
+++ b/config/locales/en_BE.yml
@@ -688,9 +688,6 @@ en_BE:
           enable_subscriptions_false: "Disabled"
           enable_subscriptions_true: "Enabled"
           shopfront_message: "Shopfront Message"
-          shopfront_message_placeholder: >
-              An optional explanation for customers detailing how your shopfront works,
-              to be displayed above the product list on your shop page.
           shopfront_message_link_tooltip: "Insert / edit link"
           shopfront_message_link_prompt: "Please enter a URL to insert"
           shopfront_closed_message: "Shopfront Closed Message"
@@ -2614,6 +2611,7 @@ en_BE:
   status: "status"
   new: "New"
   start: "Start"
+  end: "End"
   stop: "Stop"
   first: "First"
   previous: "Previous"
diff --git a/config/locales/en_CA.yml b/config/locales/en_CA.yml
index a28aba5f5b..02a377d156 100644
--- a/config/locales/en_CA.yml
+++ b/config/locales/en_CA.yml
@@ -701,9 +701,6 @@ en_CA:
           enable_subscriptions_false: "Disabled"
           enable_subscriptions_true: "Enabled"
           shopfront_message: "Shopfront Message"
-          shopfront_message_placeholder: >
-              An optional explanation for customers detailing how your shopfront works,
-              to be displayed above the product list on your shop page.
           shopfront_message_link_tooltip: "Insert/edit link"
           shopfront_message_link_prompt: "Please enter a URL to insert"
           shopfront_closed_message: "Shopfront Closed Message"
@@ -2649,6 +2646,7 @@ en_CA:
   status: "status"
   new: "New"
   start: "Start"
+  end: "End"
   stop: "Stop"
   first: "First"
   previous: "Previous"
diff --git a/config/locales/en_DE.yml b/config/locales/en_DE.yml
index f361426fda..4ade7e753b 100644
--- a/config/locales/en_DE.yml
+++ b/config/locales/en_DE.yml
@@ -696,9 +696,6 @@ en_DE:
           enable_subscriptions_false: "Disabled"
           enable_subscriptions_true: "Enabled"
           shopfront_message: "Shopfront Message"
-          shopfront_message_placeholder: >
-              An optional explanation for customers detailing how your shopfront works,
-              to be displayed above the product list on your shop page.
           shopfront_message_link_tooltip: "Insert / edit link"
           shopfront_message_link_prompt: "Please enter a URL to insert"
           shopfront_closed_message: "Shopfront Closed Message"
@@ -2624,6 +2621,7 @@ en_DE:
   status: "status"
   new: "New"
   start: "Start"
+  end: "End"
   stop: "Stop"
   first: "First"
   previous: "Previous"
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index 6e67603e81..62d3a774c5 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -701,9 +701,6 @@ en_GB:
           enable_subscriptions_false: "Disabled"
           enable_subscriptions_true: "Enabled"
           shopfront_message: "Shopfront Message"
-          shopfront_message_placeholder: >
-              An optional explanation for customers detailing how your shopfront works,
-              to be displayed above the product list on your shop page.
           shopfront_message_link_tooltip: "Insert / edit link"
           shopfront_message_link_prompt: "Please enter a URL to insert"
           shopfront_closed_message: "Shopfront Closed Message"
@@ -1481,7 +1478,7 @@ en_GB:
   shopping_oc_closed_description: "Please wait until the next cycle opens (or contact us directly to see if we can accept any late orders)"
   shopping_oc_last_closed: "The last cycle closed %{distance_of_time} ago"
   shopping_oc_next_open: "The next cycle opens in %{distance_of_time}"
-  shopping_tabs_home: "Home"
+  shopping_tabs_home: "Notices"
   shopping_tabs_shop: "Shop"
   shopping_tabs_about: "About"
   shopping_tabs_contact: "Contact"
@@ -2657,6 +2654,7 @@ en_GB:
   status: "status"
   new: "New"
   start: "Start"
+  end: "End"
   stop: "Stop"
   first: "First"
   previous: "Previous"
diff --git a/config/locales/en_US.yml b/config/locales/en_US.yml
index 2be8ce990b..9375fa03b4 100644
--- a/config/locales/en_US.yml
+++ b/config/locales/en_US.yml
@@ -693,9 +693,6 @@ en_US:
           enable_subscriptions_false: "Disabled"
           enable_subscriptions_true: "Enabled"
           shopfront_message: "Shopfront Message"
-          shopfront_message_placeholder: >
-              An optional explanation for customers detailing how your shopfront works,
-              to be displayed above the product list on your shop page.
           shopfront_message_link_tooltip: "Insert / edit link"
           shopfront_message_link_prompt: "Please enter a URL to insert"
           shopfront_closed_message: "Shopfront Closed Message"
@@ -2621,6 +2618,7 @@ en_US:
   status: "status"
   new: "New"
   start: "Start"
+  end: "End"
   stop: "Stop"
   first: "First"
   previous: "Previous"
diff --git a/config/locales/en_ZA.yml b/config/locales/en_ZA.yml
index 9e1fa82a66..0516828725 100644
--- a/config/locales/en_ZA.yml
+++ b/config/locales/en_ZA.yml
@@ -692,9 +692,6 @@ en_ZA:
           enable_subscriptions_false: "Disabled"
           enable_subscriptions_true: "Enabled"
           shopfront_message: "Shopfront Message"
-          shopfront_message_placeholder: >
-              An optional explanation for customers detailing how your shopfront works,
-              to be displayed above the product list on your shop page.
           shopfront_message_link_tooltip: "Insert / edit link"
           shopfront_message_link_prompt: "Please enter a URL to insert"
           shopfront_closed_message: "Shopfront Closed Message"
@@ -2627,6 +2624,7 @@ en_ZA:
   status: "status"
   new: "New"
   start: "Start"
+  end: "End"
   stop: "Stop"
   first: "First"
   previous: "Previous"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 4074689a0c..0520566763 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -697,10 +697,6 @@ es:
           enable_subscriptions_false: "Deshabilitado"
           enable_subscriptions_true: "Habilitado"
           shopfront_message: "Mensaje de la Tienda"
-          shopfront_message_placeholder: >
-              Una explicación opcional para los consumidores que detallan cómo funciona
-              su tienda, que se mostrará por encima de la lista de productos en su
-              página de tienda.
           shopfront_message_link_tooltip: "Insertar / editar enlace"
           shopfront_message_link_prompt: "Por favor introduzca una URL para insertar"
           shopfront_closed_message: "Mensaje de tienda cerrada"
@@ -2630,6 +2626,7 @@ es:
   status: "estado"
   new: "Nuevo"
   start: "Inicio"
+  end: "Final"
   stop: "Detener"
   first: "primero"
   previous: "Anterior"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index b62761ac26..d99916b0ca 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -704,8 +704,9 @@ fr:
           shopfront_message: "Message d'accueil boutique ouverte"
           shopfront_message_placeholder: >
               Vous pouvez indiquer ici un message de bienvenue ou un message expliquant
-              les particularités de votre boutique (facultatif). Ce message s'affiche
-              dans l'onglet Accueil de votre boutique.
+              les particularités de votre boutique. Ce message s'affiche dans l'onglet
+              Accueil de votre boutique. Si aucun message n'est affiché, l'onglet
+              Accueil n'apparaitra pas.
           shopfront_message_link_tooltip: "Insérer / modifier un lien"
           shopfront_message_link_prompt: "Veuillez entrer l'URL à insérer"
           shopfront_closed_message: "Message d'accueil boutique fermée"
@@ -1112,7 +1113,7 @@ fr:
     already_ordered:
       cart: "panier"
       message_html: "Vous avez déjà passé une commande pour ce cycle de vente. Vérifiez votre %{cart} pour voir les produits commandés. Vous pouvez annuler ou modifier votre commande jusqu'à la fermeture du cycle de vente."
-    failed: "La validation du paiement a échoué. Contactez-nous afin que nous puissions confirmer votre commande."
+    failed: "La validation du paiement a échoué. Contactez-nous afin de finaliser votre commande."
   shops:
     hubs:
       show_closed_shops: "Afficher les boutiques fermées"
diff --git a/config/locales/fr_BE.yml b/config/locales/fr_BE.yml
index a0f5acec26..b7f62f524e 100644
--- a/config/locales/fr_BE.yml
+++ b/config/locales/fr_BE.yml
@@ -698,9 +698,6 @@ fr_BE:
           enable_subscriptions_false: "Désactivé"
           enable_subscriptions_true: "Activé"
           shopfront_message: "Message d'accueil comptoir ouvert"
-          shopfront_message_placeholder: >
-              Vous pouvez ici expliquer à vos acheteurs comment votre comptoir fonctionne.
-              Ce texte s'affiche dans votre comptoir, au-dessus de la liste de produits.
           shopfront_message_link_tooltip: "Insérer / éditer le lien"
           shopfront_message_link_prompt: "Entrer l'URL pour insérer"
           shopfront_closed_message: "Message d'accueil comptoir fermé"
@@ -2651,6 +2648,7 @@ fr_BE:
   status: "statut"
   new: "Nouveau"
   start: "Début"
+  end: "Fin"
   stop: "Arrêter"
   first: "Début"
   previous: "Précédent"
diff --git a/config/locales/fr_CA.yml b/config/locales/fr_CA.yml
index b693bdcd14..11a2a18b5d 100644
--- a/config/locales/fr_CA.yml
+++ b/config/locales/fr_CA.yml
@@ -703,9 +703,6 @@ fr_CA:
           enable_subscriptions_false: "Désactivée"
           enable_subscriptions_true: "Activée"
           shopfront_message: "Message d'accueil de la boutique ouverte"
-          shopfront_message_placeholder: >
-              Vous pouvez ici expliquer à vos acheteurs comment votre boutique fonctionne.
-              Ce texte s'affiche dans votre boutique, au-dessus de la liste de produits.
           shopfront_message_link_tooltip: "Insérer / modifier un lien"
           shopfront_message_link_prompt: "Veuillez entrer l'URL à insérer"
           shopfront_closed_message: "Message d'accueil de la boutique fermée"
@@ -2660,6 +2657,7 @@ fr_CA:
   status: "Statut"
   new: "Nouveau"
   start: "Début"
+  end: "Fin"
   stop: "Arrêter"
   first: "Début"
   previous: "Précédent"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 8120178dd2..06aa5e78dc 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -700,10 +700,6 @@ it:
           enable_subscriptions_false: "Disabilitata"
           enable_subscriptions_true: "Abilitata"
           shopfront_message: "Messaggio vetrina"
-          shopfront_message_placeholder: >
-              Una spiegazione opzionale che dettaglia il funzionamento del tuo negozio,
-              che sarà visualizzata sopra al listino dei prodotti nella pagina del
-              tuo negozio.
           shopfront_message_link_tooltip: "Inserisci / modifica link"
           shopfront_message_link_prompt: "Per favore inserisci un URL"
           shopfront_closed_message: "Messaggio Chiusura Vetrina"
@@ -2644,6 +2640,7 @@ it:
   status: "stato"
   new: "Nuovo"
   start: "Inizio"
+  end: "Fine"
   stop: "Stop"
   first: "Primo"
   previous: "Precedente"
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 7cdc591199..0939d9ffb1 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -701,9 +701,6 @@ nb:
           enable_subscriptions_false: "Deaktivert"
           enable_subscriptions_true: "Aktivert"
           shopfront_message: "Melding Butikk"
-          shopfront_message_placeholder: >
-              En valgfri forklaring for kunder med detaljer om hvordan din nettbutikk
-              fungerer, for å vises over produktlisten på din side.
           shopfront_message_link_tooltip: "Sett inn / rediger lenke"
           shopfront_message_link_prompt: "Vennligst skriv inn en URL for å sette inn"
           shopfront_closed_message: "Melding Butikk Stengt"
@@ -2650,6 +2647,7 @@ nb:
   status: "Status"
   new: "Ny"
   start: "Start"
+  end: "Slutt"
   stop: "Stopp"
   first: "Først"
   previous: "Tidligere"
diff --git a/config/locales/nl_BE.yml b/config/locales/nl_BE.yml
index 5b957f2bd0..a587612b83 100644
--- a/config/locales/nl_BE.yml
+++ b/config/locales/nl_BE.yml
@@ -691,9 +691,6 @@ nl_BE:
           enable_subscriptions_false: "Deactiveer"
           enable_subscriptions_true: "Activeer"
           shopfront_message: "Etalage Boodschap"
-          shopfront_message_placeholder: >
-              Een optionele verklaring voor klanten die uitlegt hoe de etalage werkt,
-              zodat deze boven de productlijst kan weergegeven worden op je winkelpagina.
           shopfront_message_link_tooltip: "Link invoegen / bewerken"
           shopfront_message_link_prompt: "Voer een URL in om in te voegen"
           shopfront_closed_message: "Bericht Gesloten Etalage"
@@ -2623,6 +2620,7 @@ nl_BE:
   status: "status"
   new: "Nieuw"
   start: "Start"
+  end: "Eind"
   stop: "Stop"
   first: "Eerst"
   previous: "Voorgaande"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index cdf4fe4150..ec4deb12f5 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -678,10 +678,6 @@ pt:
           enable_subscriptions_false: "Desactivado"
           enable_subscriptions_true: "Activo"
           shopfront_message: "Mensagem da Loja"
-          shopfront_message_placeholder: >
-              Uma explicação breve e opcional para os consumidores a explicar como
-              funciona a sua loja, a ser exibida acima da lista de produtos na sua
-              loja.
           shopfront_message_link_tooltip: "Inserir / editar link"
           shopfront_message_link_prompt: "Por favor insira um URL"
           shopfront_closed_message: "Mensagem de Loja Fechada"
@@ -2580,6 +2576,7 @@ pt:
   status: "estado"
   new: "Novo"
   start: "Começar"
+  end: "Terminar"
   stop: "Parar"
   first: "Primeiro"
   previous: "Anterior"
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 7482fd5d35..853350e289 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -702,10 +702,6 @@ pt_BR:
           enable_subscriptions_false: "Desativado"
           enable_subscriptions_true: "ativado"
           shopfront_message: "Mensagem da vitrine da loja"
-          shopfront_message_placeholder: >
-              Uma breve e opcional explicação para os consumidores detalhando como
-              funciona a sua loja, a ser exibida acima da lista de produtos na sua
-              vitrine.
           shopfront_message_link_tooltip: "Inserir / editar link"
           shopfront_message_link_prompt: "Digite um URL para inserir"
           shopfront_closed_message: "Mensagem de loja fechada"
@@ -2655,6 +2651,7 @@ pt_BR:
   status: "status"
   new: "Novo"
   start: "Início"
+  end: "Fim"
   stop: "Parar"
   first: "Primeiro"
   previous: "Anterior"
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 0963dcd646..81c803348d 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -387,9 +387,6 @@ sv:
           allow_order_changes_false: "Lagda beställningar kan inte ändras/avbrytas"
           allow_order_changes_true: "Kunder kan ändra/avbryta beställningar medan beställningscykeln är öppen"
           shopfront_message: "Butiksmeddelande"
-          shopfront_message_placeholder: >
-              En frivillig förklaring för kunder som beskriver hur ditt skyltfönster
-              skall användas. Den visas ovanför produktlistan i affärsfönstret.
           shopfront_closed_message: "Meddelande för stängd butik"
           shopfront_closed_message_placeholder: >
               Ett meddelande som ger en mer detaljerad förklaring varför din affär