Apply consistent labelling for solar PV and wind

Author: kndehaan

app/views/content/whats_new.en.html.md

@@ -477,7 +477,7 @@ The costs export functionality of the ETM has undergone a major update! The down
 
 -> <img src="/assets/pages/whats_new/costs_specification_costs_functionality_en.png" width="600" /> <-
 
-### Solar PV households and buildings capacity sliders moved to Supply
+### Solar rooftop (households) and buildings capacity sliders moved to Supply
 The sliders for solar PV capacities on rooftops of households and buildings now allow users to directly indicate installed capacities for these technologies (in MW). The sliders have been moved to the **[Renewable electricity](/scenario/supply/electricity_renewable/solar-power)** section.
 
 ### Land use of solar and wind visualization available

config/interface/output_element_series/land_use_solar_wind_chart.yml

@@ -28,7 +28,7 @@
   output_element_key: land_use_solar_wind_chart
   key: wind_inland_small_land_use_solar_wind_chart
 
-- label: battery_solar_PV
+- label: battery_solar_pv
   color: "#e1b20b"
   order_by: 15
   group: solar_pv_plants

config/locales/interface/input_elements/en_costs.yml

@@ -462,9 +462,9 @@ en:
         for your scenario for
         <a href="scenario/flexibility/flexibility_storage/large-scale-batteries">
         large-scale batteries</a>,
-        <a href="scenario/flexibility/flexibility_storage/wind-turbines-with-storage-systems">
+        <a href="scenario/flexibility/flexibility_storage/wind-onshore-with-battery-system">
         batteries integrated with wind turbines</a>, and
-        <a href="scenario/flexibility/flexibility_storage/solar-plants-with-storage-systems">
+        <a href="scenario/flexibility/flexibility_storage/solar-on-land-with-battery-system">
         batteries integrated with solar plants</a>.
     om_costs_water_river:
       title: O&M costs hydro river
@@ -1221,9 +1221,9 @@ en:
         With this slider you can determine the future round-trip efficiency of
         <a href="/scenario/flexibility/flexibility_storage/large-scale-batteries">
         large-scale batteries</a>, including the batteries used in
-        <a href="/scenario/flexibility/flexibility_storage/wind-turbines-with-storage-systems">
+        <a href="/scenario/flexibility/flexibility_storage/wind-onshore-with-battery-system">
         wind turbines with storage systems</a> and in
-        <a href="/scenario/flexibility/flexibility_storage/solar-plants-with-storage-systems">
+        <a href="/scenario/flexibility/flexibility_storage/solar-on-land-with-battery-system">
         solar plants with storage systems</a>.
     efficiency_energy_flexibility_pumped_storage_electricity:
       title: Reservoirs

config/locales/interface/input_elements/en_flexibility.yml

@@ -382,7 +382,7 @@ en:
         decreased to simulate a less sunny year.
         </br></br>
         The slider not only increases the number of full load hours but also changes the shape of
-        the hourly production profile accordingly. This slider also affects solar PV plants onshore
+        the hourly production profile accordingly. This slider also affects Solar on land
         with a battery system and plants for decidated hydrogen production through electrolysis.
     flh_of_energy_power_solar_pv_offshore:
       title: Solar offshore
@@ -562,7 +562,7 @@ en:
       title: Solar on land
       short_description:
       description: With this slider you set the curtailment as a percentage of the
-        peak power. Solar plants on land are connected to the HV-net in the ETM. The installed
+        peak power. Solar on land is 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 offshore

config/locales/interface/input_elements/en_supply_electricity.yml

@@ -160,7 +160,7 @@ en:
         relative to the installed capacity. They will therefore both change accordingly if
         you adjust this slider. You can also change the relative ratios in the Flexibility
         section, under
-        <a href="/scenario/flexibility/flexibility_storage/solar-plants-with-storage-systems">
+        <a href="/scenario/flexibility/flexibility_storage/solar-on-land-with-battery-system">
         Electricity storage</a>. <br/><br/>
         You can click on the 'Technical and financial properties' to see the specifications of
         the solar PV plants without the batteries. See
@@ -528,7 +528,7 @@ en:
         relative to the installed capacity. They will therefore both change accordingly if
         you adjust this slider. You can also change the relative ratios in the Flexibility
         section, under
-        <a href="/scenario/flexibility/flexibility_storage/wind-turbines-with-storage-systems">
+        <a href="/scenario/flexibility/flexibility_storage/wind-onshore-with-battery-system">
         Electricity storage</a>. <br/><br/>
         You can click on the 'Technical and financial properties' to see the specifications of the
         wind turbines without the batteries. See

config/locales/interface/input_elements/en_supply_hydrogen.yml

@@ -85,7 +85,7 @@ en:
         Note: the parameters in the table belong to the plants without CCS, so when you have set 100% CCS,
         you will see no installed capacity here.
     capacity_of_energy_hydrogen_wind_turbine_offshore:
-      title: Offshore wind turbine for H<sub>2</sub>
+      title: Wind offshore (with electrolyser)
       short_description:
       description: |
         How many wind turbines will produce electricity that will directly
@@ -106,7 +106,7 @@ en:
         of the wind turbines can be found in the <a href="/scenario/supply/electricity_renewable/wind-turbines\">Renewable
         electricity section</a>.<br/>
     capacity_of_energy_hydrogen_solar_pv_solar_radiation:
-      title: Solar PV plant for H<sub>2</sub>
+      title: Solar on land (with electrolyser)
       short_description:
       description: "How many solar pv plants will be build in the future for hydrogen
         production using electrolysers?\r\n<br/><br/>\r\nThis slider sets installed

config/locales/interface/input_elements/nl_costs.yml

@@ -487,9 +487,9 @@ nl:
         voor jouw scenario voor
         <a href="scenario/flexibility/flexibility_storage/large-scale-batteries">
         grootschalige batterijopslag</a>,
-        <a href="scenario/flexibility/flexibility_storage/wind-turbines-with-storage-systems">
+        <a href="scenario/flexibility/flexibility_storage/wind-onshore-with-battery-system">
         batterijen geïntegreerd met windmolens</a>, and
-        <a href="scenario/flexibility/flexibility_storage/solar-plants-with-storage-systems">
+        <a href="scenario/flexibility/flexibility_storage/solar-on-land-with-battery-system">
         batterijen geïntegreerd met zonnecentrales</a>.
     om_costs_water_river:
       title: Onderhoudskosten waterkracht rivier
@@ -1257,9 +1257,9 @@ nl:
         Met dit schuifje kun je de toekomstige retourefficiëntie van
         <a href="/scenario/flexibility/flexibility_storage/large-scale-batteries">
         grootschalige batterijopslag</a> bepalen, waaronder ook de batterijen die gebruikt worden in
-        <a href="/scenario/flexibility/flexibility_storage/wind-turbines-with-storage-systems">
+        <a href="/scenario/flexibility/flexibility_storage/wind-onshore-with-battery-system">
         windmolens met opslagsystemen</a> en
-        <a href="/scenario/flexibility/flexibility_storage/solar-plants-with-storage-systems">
+        <a href="/scenario/flexibility/flexibility_storage/solar-on-land-with-battery-system">
         zonnecentrales met opslagsystemen</a>.
     efficiency_energy_flexibility_pumped_storage_electricity:
       title: Stuwmeren

config/locales/interface/input_elements/nl_supply_electricity.yml

@@ -142,7 +142,7 @@ nl:
         relatief bepaald ten opzichte van het geïnstalleerde vermogen. Ze zullen dan ook beide
         meeveranderen als je dit schuifje aanpast. Je kunt de relatieve verhouding bepalen in
         de Flexibiliteit sectie, onder
-         <a href="/scenario/flexibility/flexibility_storage/solar-plants-with-storage-systems">
+         <a href="/scenario/flexibility/flexibility_storage/solar-on-land-with-battery-system">
         Opslag elektriciteit</a>. <br/><br/>
         Klik op de 'Technische parameters en kosten' om de specificaties van de zonnecentrale
         PV zonder het batterijsysteem te zien. In
@@ -560,7 +560,7 @@ nl:
         relatief bepaald ten opzichte van het geïnstalleerde vermogen. Ze zullen dan ook beide
         meeveranderen als je dit schuifje aanpast. Je kunt de relatieve verhouding bepalen in
         de Flexibiliteit sectie, onder
-         <a href="/scenario/flexibility/flexibility_storage/wind-turbines-with-storage-systems">
+         <a href="/scenario/flexibility/flexibility_storage/wind-onshore-with-battery-system">
         Opslag elektriciteit</a>. <br/><br/>
         Klik op de 'Technische parameters en kosten' om de specificaties van de windmolens
         zonder het batterijsysteem te zien. In

config/locales/interface/input_elements/nl_supply_hydrogen.yml

@@ -85,11 +85,11 @@ nl:
         Let op: de parameters in de tabel horen bij de centrales zonder CCS, dus wanneer je 100% CCS hebt ingesteld,
         zul je hier geen vermogen zien.
     capacity_of_energy_hydrogen_wind_turbine_offshore:
-      title: Windmolen op zee voor H<sub>2</sub>
+      title: Wind op zee (met elektrolyser)
       short_description:
       description: |
         Hoeveel windmolens zullen elektriciteit produceren dat direct
-        zal worden omgezet in waterstof met electrolysers?</br></br>
+        zal worden omgezet in waterstof met elektrolysers?</br></br>
         Er zijn grote ambities voor windparken ver op zee. Voor deze windparken zal
         het waarschijnlijk economisch haalbaarder zijn om de elektriciteit ter plekke
         om te zetten in waterstof in plaats van de elektriciteit eerst naar land te
@@ -105,10 +105,10 @@ nl:
         specificaties hieronder zijn alleen voor de elektrolyser, niet voor de windmolens.
         De specificaties van de windmolens kun je vinden in het tabblad <a href="/scenario/supply/electricity_renewable/wind-turbines\">Hernieuwbare elektriciteit</a>.
     capacity_of_energy_hydrogen_solar_pv_solar_radiation:
-      title: Zonnecentrale PV voor H<sub>2</sub>
+      title: Zon op land (met elektrolyser)
       short_description:
       description: "Hoeveel zonneparken zullen er in de toekomst gebouwd worden voor de
-        productie van waterstof met behulp van electrolysers?\r\n<br/><br/>\r\nDeze
+        productie van waterstof met behulp van elektrolysers?\r\n<br/><br/>\r\nDeze
         schuif zet het vermogen van zonneparken dat ingezet wordt voor waterstofproductie
         en het benodigde vermogen van elektrolyse-installaties om de geproduceerde
         elektriciteit om te zetten in waterstof. Het vermogen van de elektrolyse-installaties

config/locales/interface/output_element_series/en_groups.yml

@@ -80,8 +80,8 @@ en:
       sector: "Sectors"
       solar: "Solar"
       solar_pv_plants: "Solar on land"
-      solar_buildings: "Solar rooftop (buildings)"
-      solar_households: "Solar rooftop (households)"
+      solar_buildings: "Solar buildings"
+      solar_households: "Solar households"
       steam_methane_reforming: "SMR"
       ammonia_reforming: "Ammonia"
       autothermal_reforming: "ATR"