Big upgrade and supplier style upgrades

config/locales/supplier.en.yml

@@ -19,11 +19,6 @@ en:
         no_lists: No active lists
       active_orders:
         no_orders: No active orders
-    messages:
-      could_not_arrange_tables: 'The tables could not be arranged'
-      could_not_arrange_tables_distributed: 'The tables could not be arranged. Does the ${models.section|downcase} have a width and a height?'
-      could_not_arrange_tables_by_row: 'The tables could not be arranged. Does the ${models.section|downcase} have a width and a height?'
-      could_not_arrange_tables_by_column: 'The tables could not be arranged. Does the ${models.section|downcase} have a width and a height?'
     top_menu:
       menu: Menu
     active_lists:
@@ -119,6 +114,7 @@ en:
             after_field: ' ${models.plural.table}'
           close_button: Close
           arrange_button: Distribute
+          cannot_arrange: 'The tables could not be arranged. Does the ${models.section|downcase} have a width and a height?'
     settings:
       title: Settings
       save: Save settings