Fixup merge conflicts and remove unused text

app/views/admin/producer_properties/_form.html.haml

@@ -4,8 +4,8 @@
   %table.index.sortable{"data-hook" => "", "data-sortable-link" => main_app.update_positions_admin_enterprise_producer_properties_url(@enterprise)}
     %thead
       %tr{"data-hook" => "producer_properties_header"}
-        %th{colspan: "2"}= t('.property')
-        %th= t('.value')
+        %th{colspan: "2"}= t('admin.products.properties.property_name')
+        %th= t('admin.description')
         %th.actions
     %tbody#producer_properties{"data-hook" => ""}
       = f.fields_for :producer_properties do |pp_form|

config/locales/en.yml

@@ -224,11 +224,11 @@ en:
         inherits_properties?: Inherits Properties?
         available_on: Available On
         av_on: "Av. On"
-      variants:
-        to_order_tip: "Items made to order do not have a set stock level, such as loaves of bread made fresh to order."
       properties:
         property_name: Property Name
         inherited_property: Inherited Property
+      variants:
+        to_order_tip: "Items made to order do not have a set stock level, such as loaves of bread made fresh to order."
 
     variant_overrides:
       loading_flash:
@@ -507,9 +507,6 @@ en:
         advanced_settings: Advanced Settings
         update_and_close: Update and Close
     producer_properties:
-      form:
-        property: Property
-        value: Value
       index:
         title: Producer Properties
     shared: