Update locales for solar PV

Author: kaskranenburgQ

config/locales/en_custom_curves.yml

@@ -152,17 +152,17 @@ en:
       hydrogen_import: Hydrogen import
       network_gas_export: Gas export
       network_gas_import: Gas import
-      weather/solar_pv_on_roof_households: Solar PV households
-      weather/solar_pv_on_roof_buildings: Solar PV buildings
-      weather/solar_pv_on_land: Solar PV plants onshore
-      weather/solar_pv_offshore: Solar PV plants offshore
+      weather/solar_pv_on_roof_households: Solar rooftop (households)
+      weather/solar_pv_on_roof_buildings: Solar rooftop (buildings)
+      weather/solar_pv_on_land: Solar on land
+      weather/solar_pv_offshore: Solar offshore
       weather/solar_thermal: Solar thermal
       geothermal_heat_shallow: Geothermal (shallow)
       geothermal_heat_deep: Geothermal (deep)
       river: Hydropower (river)
       weather/wind_offshore_baseline: Wind offshore
       weather/wind_coastal_baseline: Wind coastal
-      weather/wind_inland_baseline: Wind inland
+      weather/wind_inland_baseline: Wind onshore
       weather/insulation_terraced_houses_high: Contemporary terraced houses (from 2005) heat demand
       weather/insulation_terraced_houses_medium:  Modern terraced houses (1965-2004) heat demand
       weather/insulation_terraced_houses_low: Old terraced houses (before 1964) heat demand

config/locales/en_etm.yml

@@ -641,8 +641,8 @@ en:
     heat_delivery_system: "Heat delivery system"
     onshore: "Onshore"
     offshore: "Offshore"
-    wind_turbine_inland: "Onshore inland wind turbines"
-    solar_pv_solar_radiation: "Solar PV plants"
+    wind_turbine_inland: "Wind onshore"
+    solar_pv_solar_radiation: "Solar on land"
     large_reactors: "Large reactors"
     small_reactors: "Small reactors"
     industry_chps: "CHPs"

config/locales/interface/input_elements/en_flexibility.yml

@@ -547,28 +547,28 @@ en:
     electricity_interconnector_11_marginal_costs: *interconnector_marginal_costs
     electricity_interconnector_12_marginal_costs: *interconnector_marginal_costs
     curtailment_of_households_solar_pv_solar_radiation:
-      title: Solar PV households
+      title: Solar rooftop (households)
       short_description:
       description: With this slider you set the curtailment as a percentage of the
-        peak power. Solar panels on houses are connected to the LV-net in the ETM.
+        peak power. Solar panels on the rooftops of households are connected to the LV-net in the ETM.
         The installed capacity can be adjusted <a href="/scenario/demand/households/solar-panels">here</a>.
     curtailment_of_buildings_solar_pv_solar_radiation:
-      title: Solar PV buildings
+      title: Solar rooftop (buildings)
       short_description:
       description: With this slider you set the curtailment as a percentage of the
-        peak power. Solar panels on buildings are connected to the LV-net in the ETM.
+        peak power. Solar panels on the rooftops of buildings are connected to the LV-net in the ETM.
         The installed capacity can be adjusted <a href="/scenario/demand/buildings/solar-panels">here</a>.
     curtailment_of_energy_power_solar_pv_solar_radiation:
-      title: Solar PV plants
+      title: Solar on land
       short_description:
       description: With this slider you set the curtailment as a percentage of the
-        peak power. Solar PV plants are connected to the HV-net in the ETM. The installed
+        peak power. Solar plants on land are connected to the HV-net in the ETM. The installed
         capacity can be adjusted <a href="/scenario/supply/electricity_renewable/solar-power">here</a>.
     curtailment_of_energy_power_solar_pv_offshore:
-      title: Solar PV plants offshore
+      title: Solar offshore
       short_description:
       description: With this slider you set the curtailment as a percentage of the
-        peak power. Offshore solar PV plants are connected to the offshore-net in the ETM.
+        peak power. Offshore solar plants are connected to the offshore-net in the ETM.
         The installed capacity can be adjusted <a href="/scenario/demand/households/solar-panels">here</a>.
     relative_capacity_of_electrolyser:
       title: Offshore electrolyser

config/locales/interface/input_elements/nl_flexibility.yml

@@ -559,31 +559,31 @@ nl:
     electricity_interconnector_11_marginal_costs: *interconnector_marginal_costs
     electricity_interconnector_12_marginal_costs: *interconnector_marginal_costs
     curtailment_of_households_solar_pv_solar_radiation:
-      title: Zon op dak huishoudens
+      title: Zon op dak (huishoudens)
       short_description:
       description: Met dit schuifje stel je de productiebeperking in als percentage
         van het piekvermogen. Zonnepanelen op huizen zijn verbonden aan het laagspanningsnet
         in het ETM. Het geïnstalleerd vermogen is <a href="/scenario/demand/households/solar-panels">hier</a>
         aan te passen.
     curtailment_of_buildings_solar_pv_solar_radiation:
-      title: Zon op dak gebouwen
+      title: Zon op dak (gebouwen)
       short_description:
       description: Met dit schuifje stel je de productiebeperking in als percentage
         van het piekvermogen. Zonnepanelen op gebouwen zijn verbonden aan het laagspanningsnet
         in het ETM. Het geïnstalleerd vermogen is <a href="/scenario/demand/buildings/solar-panels">hier</a>
         aan te passen.
     curtailment_of_energy_power_solar_pv_solar_radiation:
-      title: Zonneparken
+      title: Zon op land
       short_description:
       description: Met dit schuifje stel je de productiebeperking in als percentage
-        van het piekvermogen. Zonneparken zijn verbonden aan het hoogspanningsnet
+        van het piekvermogen. Zon op land is verbonden aan het hoogspanningsnet
         in het ETM. Het geïnstalleerd vermogen is <a href="/scenario/supply/electricity_renewable/solar-power">hier</a>
         aan te passen.
     curtailment_of_energy_power_solar_pv_offshore:
-      title: Zonneparken op zee
+      title: Zon op zee
       short_description:
       description: Met dit schuifje stel je de productiebeperking in als percentage
-        van het piekvermogen. Zonneparken op zee zijn in het ETM aan hetzelfde net verbonden als wind op zee.
+        van het piekvermogen. Zon op zee is in het ETM aan hetzelfde net verbonden als wind op zee.
         Het geïnstalleerd vermogen is <a href="/scenario/supply/electricity_renewable/solar-power">hier</a>
         aan te passen.
     relative_capacity_of_electrolyser:

config/locales/interface/output_element_series/en_groups.yml

@@ -79,9 +79,9 @@ en:
       rooftop_area: "Rooftop area"
       sector: "Sectors"
       solar: "Solar"
-      solar_pv_plants: "Solar PV plants"
-      solar_buildings: "Solar PV buildings"
-      solar_households: "Solar PV households"
+      solar_pv_plants: "Solar on land"
+      solar_buildings: "Solar rooftop (buildings)"
+      solar_households: "Solar rooftop (households)"
       steam_methane_reforming: "SMR"
       ammonia_reforming: "Ammonia"
       autothermal_reforming: "ATR"

config/locales/interface/output_element_series/en_labels.yml

@@ -11,8 +11,8 @@ en:
         agriculture_heat: "Agriculture heat"
         all_time_resolved_carriers_cumulative_incl_correction_incl_offset_curve: "Including correction"
         all_time_resolved_carriers_cumulative_excl_correction_incl_offset_curve: "Excluding correction"
-        battery_wind_inland:  "Wind inland with battery system"
-        battery_solar_PV:  "Solar PV plants with battery system"
+        battery_wind_inland:  "Wind onshore (with battery system)"
+        battery_solar_PV:  "Solar on land (with battery system)"
         costs_building_and_installations: "Building and installations"
         costs_storage_and_conversion: "Storage and conversion"
         costs_production: "Energy production"
@@ -585,9 +585,9 @@ en:
         energy_power_nuclear_gen3_uranium_oxide: 'Nuclear 3rd Gen'
         energy_power_nuclear_small_modular_reactor_uranium_oxide: 'Nuclear small modular reactor'
         energy_power_solar_csp_solar_radiation: 'Concentrated solar power'
-        energy_power_solar_pv_solar_radiation: 'Solar PV plants'
-        energy_power_offshore_solar_pv: 'Solar PV plants offshore'
-        energy_power_solar_pv_offshore: 'Solar PV plants offshore'
+        energy_power_solar_pv_solar_radiation: 'Solar on land'
+        energy_power_offshore_solar_pv: 'Solar offshore'
+        energy_power_solar_pv_offshore: 'Solar offshore'
         energy_power_supercritical_coal: 'Coal conventional'
         energy_power_supercritical_waste_mix: 'Waste incinerator'
         energy_power_supercritical_ccs_waste_mix: 'Waste incinerator CCS'
@@ -604,8 +604,8 @@ en:
         energy_power_wind_turbine_coastal: 'Wind coastal'
         energy_power_wind_turbine_inland: 'Wind onshore'
         energy_power_wind_turbine_offshore: 'Wind offshore'
-        energy_power_hybrid_wind_turbine_offshore: 'Wind offshore (hybrid)'
-        energy_power_hybrid_wind_turbine_offshore_curtailed_electricity: 'Curtailment wind offshore (hybrid)'
+        energy_power_hybrid_wind_turbine_offshore: 'Wind offshore (with hybrid connection)'
+        energy_power_hybrid_wind_turbine_offshore_curtailed_electricity: 'Curtailment wind offshore (with hybrid connection)'
         energy_power_wood_pellets_must_run: 'Biomass power plant (must-run)'
         energy_power_wood_pellets_dispatchable: 'Biomass power plant (dispatchable)'
         energy_power_wood_pellets_ccs_must_run: 'Biomass power plant + CCS (must-run)'
@@ -1270,8 +1270,8 @@ en:
         offshore: "Offshore"
         offshore_net: "Offshore net"
         offshore_wind_turbines: "Wind offshore"
-        offshore_hybrid_wind_turbines: "Wind offshore (hybrid)"
-        hybrid_offshore_wind_output_capacity: "Wind offshore (hybrid)"
+        offshore_hybrid_wind_turbines: "Wind offshore (with hybrid connection)"
+        hybrid_offshore_wind_output_capacity: "Wind offshore (with hybrid connection)"
         hybrid_offshore_electrolyser_input_capacity: "Offshore electrolyser"
         hybrid_offshore_cable_input_capacity: "Offshore electricity cable"
         oil: "Oil"
@@ -1487,9 +1487,9 @@ en:
         with_im_export_1990: "with im export 1990"
         with_im_export_2010: "with im export 2010"
         with_im_export_20xx: "with im export 20xx"
-        wind_inland: "Wind inland"
-        wind_inland_small: "Wind inland (small-scale)"
-        wind_inland_large: "Wind inland (large-scale)"
+        wind_inland: "Wind onshore"
+        wind_inland_small: "Wind onshore (small-scale)"
+        wind_inland_large: "Wind onshore (large-scale)"
         wind_offshore: "Wind offshore"
         wind_offshore_production: "Wind offshore production"
         wind_onshore_production: "Wind onshore production"

config/locales/interface/output_element_series/nl_labels.yml

@@ -11,8 +11,8 @@ nl:
         agriculture_heat: "Landbouw warmtevraag"
         all_time_resolved_carriers_cumulative_incl_correction_incl_offset_curve: "Inclusief correctie"
         all_time_resolved_carriers_cumulative_excl_correction_incl_offset_curve: "Exclusief correctie"
-        battery_wind_inland:  "Wind op land met batterijsysteem"
-        battery_solar_PV:  "Zon op land met batterijsysteem"
+        battery_wind_inland:  "Wind op land (met batterijsysteem)"
+        battery_solar_PV:  "Zon op land (met batterijsysteem)"
         costs_building_and_installations: "Gebouwen/Installaties"
         costs_storage_and_conversion: "Flexibiliteit en opslag"
         costs_production: "Productiemiddelen"
@@ -575,12 +575,12 @@ nl:
         energy_battery_solar_pv: "Zon op land (batterij)"
         energy_battery_wind_turbine_inland: 'Wind op land (batterij)'
         energy_battery_wind_electricity: 'Wind op land (batterij)'
-        energy_power_solar_pv_curtailed_electricity_output_curve: 'Productieverlaging zonneparken'
-        energy_power_solar_pv_offshore_curtailed_electricity_output_curve: 'Productieverlaging zonneparken op zee'
-        energy_power_solar_pv_electricity_output_curve: 'Opwek zonneparken'
-        energy_power_solar_pv_offshore_electricity_output_curve: 'Opwek zonneparken op zee'
-        energy_battery_solar_pv_electricity_output_curve: 'Opwek zonneparken met batterij'
-        energy_battery_solar_pv_curtailed_electricity_output_curve: 'Productieverlaging zonneparken met batterij'
+        energy_power_solar_pv_curtailed_electricity_output_curve: 'Productieverlaging zon op land'
+        energy_power_solar_pv_offshore_curtailed_electricity_output_curve: 'Productieverlaging zon op zee'
+        energy_power_solar_pv_electricity_output_curve: 'Opwek zon op land'
+        energy_power_solar_pv_offshore_electricity_output_curve: 'Opwek zon op zee'
+        energy_battery_solar_pv_electricity_output_curve: 'Opwek zon op land (met batterijsysteem)'
+        energy_battery_solar_pv_curtailed_electricity_output_curve: 'Productieverlaging zon op land (met batterijsysteem)'
         energy_power_solar_pv_solar_radiation: 'Zon op land'
         energy_power_offshore_solar_pv: 'Zon op zee'
         energy_power_supercritical_coal: 'Kolen conventioneel'
@@ -598,7 +598,7 @@ nl:
         energy_power_wind_turbine_coastal: 'Wind aan kust'
         energy_power_wind_turbine_inland: 'Wind op land'
         energy_power_wind_turbine_offshore: 'Wind op zee'
-        energy_power_hybrid_wind_turbine_offshore: 'Wind op zee (hybride)'
+        energy_power_hybrid_wind_turbine_offshore: 'Wind op zee (met hybride aansluiting)'
         energy_power_hybrid_wind_turbine_offshore_curtailed_electricity: 'Productieverlaging hybride windmolens op zee'
         energy_export_hydrogen_baseload_for_mekko: 'Export (basislast)'
         energy_export_hydrogen_backup_for_mekko: 'Export (overschot)'
@@ -1116,8 +1116,8 @@ nl:
         local_chp_biogas: "Biogas-WKK (must-run)"
         local_electrolysis: "Lokale elektrolyse"
         locally_produced_heat: "Lokaal geproduceerde warmte"
-        local_solar_pv_households: "Zon PV Huishoudens"
-        local_solar_pv_buildings: "Zon PV Gebouwen"
+        local_solar_pv_households: "Zon op dak (huishoudens)"
+        local_solar_pv_buildings: "Zon op dak (gebouwen)"
         losses_of_export: "Verliezen van export"
         low_voltage_network: "Laagspanningsnet"
         lpg: "LPG"
@@ -1280,8 +1280,8 @@ nl:
         offshore: "Op zee"
         offshore_net: "Net op zee"
         offshore_wind_turbines: "Wind op zee"
-        offshore_hybrid_wind_turbines: "Wind op zee (hybride)"
-        hybrid_offshore_wind_output_capacity: "Wind op zee (hybride)"
+        offshore_hybrid_wind_turbines: "Wind op zee (met hybride aansluiting)"
+        hybrid_offshore_wind_output_capacity: "Wind op zee (met hybride aansluiting)"
         hybrid_offshore_electrolyser_input_capacity: "Elektrolyser op zee"
         hybrid_offshore_cable_input_capacity: "Elektriciteitskabel op zee"
         oil: "Olie"
@@ -1584,7 +1584,7 @@ nl:
         other: "Overig"
         transport: "Binnenlands transport"
         transport_generic: "Transport"
-        wind_coastal_production: "Wind aan de kust"
+        wind_coastal_production: "Wind aan kust"
         solar_thermal_heat_production: "Zonthermie"
         residences_before_1945: "Woningen voor 1945"
         residences_1945_1964: "Woningen 1945 - 1964"

config/locales/interface/output_elements/en_flexibility.yml

@@ -406,10 +406,10 @@ en:
         By default, the chart shows the <i>daily</i> peak capacity of the profile for the whole year.
         Select a month or week in the dropdown menu to see the <i>hourly</i> values.
     flexibility_hourly_battery_wind:
-      title: Hourly production of wind inland with battery
+      title: Hourly production of wind onshore with battery
       short_description:
       description: |
-        This chart shows the hourly production of wind inland wind turbines that
+        This chart shows the hourly production of wind onshore turbines that
         have an integrated battery system and a reduced grid connection capacity. </br></br>
         You can install these types of turbines and learn more about how they work in
         the Supply section, under

config/locales/interface/output_elements/labels_groups/en_tables.yml

@@ -15,7 +15,7 @@ en:
         availability: "Availability"
         available_capacity: "Available capacity"
         battery_solar_pv: "Solar on land (battery)"
-        battery_wind_inland: "Wind on land (battery)"
+        battery_wind_inland: "Wind onshore (battery)"
         biogas_chp_ht: "Biogas CHP (HT)"
         biogas_chp_mt: "Biogas CHP (MT)"
         coal_chp_pwd_ht: "Pulverized coal CHP (HT)"
@@ -80,7 +80,7 @@ en:
         oil_chp: "Oil CHP"
         oil_plant: "Oil ultra supercritical"
         offshore_wind_turbines: "Wind offshore"
-        offshore_hybrid_wind_turbines: "Wind offshore (hybrid)"
+        offshore_hybrid_wind_turbines: "Wind offshore (with hybrid connection)"
         onshore_wind_turbines: "Wind onshore"
         operating_costs: "Marginal costs"
         position: "Merit order position"
@@ -145,8 +145,8 @@ en:
         agriculture_chp_gas_dispatchable: "Agriculture gas motor CHP (dispatchable)"
         agriculture_chp_gas_must_run: "Agriculture gas motor CHP (must-run)"
         agriculture_chp_wood_pellets: "Agriculture biomass CHP"
-        battery_solar_pv: "Solar PV plant onshore with battery"
-        battery_wind_inland: "Wind onshore with battery"
+        battery_solar_pv: "Solar on land (with battery)"
+        battery_wind_inland: "Wind onshore (with battery)"
         biogas_chp_ht: "Biogas CHP (HT)"
         biogas_chp_mt: "Biogas CHP (MT)"
         coal_chp_pwd_ht: "Pulverized coal CHP (HT)"
@@ -194,7 +194,7 @@ en:
         nuclear_smr: "Nuclear small modular reactor"
         oil_plant: "Oil power plant"
         offshore_wind_turbines: "Wind offshore"
-        offshore_hybrid_wind_turbines: "Wind hybrid offshore"
+        offshore_hybrid_wind_turbines: "Wind offshore (with hybrid connection)"
         onshore_wind_turbines: "Wind onshore"
         households_solar_pv_solar_radiation: "Solar PV roof (households)"
         buildings_solar_pv_solar_radiation: "Solar PV roof (buildings)"
@@ -390,10 +390,10 @@ en:
         buildings_solar_pv: "Solar PV buildings"
         curtailed_electricity_percentage: "Curtailed production"
         curtailment_percentage: "Peak reduction"
-        energy_power_solar_pv: "Solar PV plants"
-        energy_battery_solar_pv: "Solar PV plants with battery"
-        energy_power_solar_pv_offshore: "Solar PV plants offshore"
-        households_solar_pv: "Solar PV households"
+        energy_power_solar_pv: "Solar on land"
+        energy_battery_solar_pv: "Solar on land (with battery)"
+        energy_power_solar_pv_offshore: "Solar offshore"
+        households_solar_pv: "Solar rooftop (households)"
         installed_capacity: "Installed capacity"
         peak_power_after_curtailment: "Peak power"
         peak_power_before_curtailment: "Peak power"
@@ -460,15 +460,15 @@ en:
         wind_small: "Wind turbines inland (small-scale)"
         wind_offshore: "Wind turbines offshore"
         wind_coastal: "Wind coastal"
-        battery_wind_inland:  "Wind inland with battery system"
-        solar_pv_buildings: "Solar PV buildings"
-        solar_pv_households: "Solar PV households"
-        solar_pv_onshore: "Solar PV plants onshore"
-        solar_pv_plants: "Solar PV plants"
-        solar_pvt_households: "Solar PVT households"
-        solar_thermal_households: "Solar thermal households"
-        solar_thermal_buildings: "Solar thermal buildings"
-        battery_solar_pv:  "Solar PV plants with battery system"
+        battery_wind_inland:  "Wind onshore (with battery system)"
+        solar_pv_buildings: "Solar rooftop (buildings)"
+        solar_pv_households: "Solar rooftop (households)"
+        solar_pv_onshore: "Solar on land"
+        solar_pv_plants: "Solar on land"
+        solar_pvt_households: "Solar PVT (households)"
+        solar_thermal_households: "Solar thermal (households)"
+        solar_thermal_buildings: "Solar thermal (buildings)"
+        battery_solar_pv:  "Solar on land (with battery system)"
       capacity_energy_hybrid_offshore:
         input_capacity: "Total input capacity"
         output_capacity: "Total output capacity"