Skip to content

Commit a5ff448

Browse files
mabijkerkkaskranenburgQ
authored andcommitted
Standardize labels for solar and wind #4465
1 parent f9e5e7d commit a5ff448

File tree

4 files changed

+84
-84
lines changed

4 files changed

+84
-84
lines changed

config/locales/interface/output_element_series/en_labels.yml

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ en:
316316
buildings_solar_pv: 'Buildings'
317317
buildings_solar_pv_curtailed_electricity_output_curve: 'Curtailment buildings'
318318
buildings_solar_pv_electricity_output_curve: 'Production buildings'
319-
buildings_solar_pv_solar_radiation: 'Solar panels buildings'
319+
buildings_solar_pv_solar_radiation: 'Solar rooftop (buildings)'
320320
busses: "Buses"
321321
capaciteit_bezet_mva: "Capacity used - [MVA]"
322322
capaciteit_totaal_mva: "Capacity - total [MVA]"
@@ -412,7 +412,7 @@ en:
412412
coal_trains: "Coal trains"
413413
coal_national_transport: "Coal - national transport"
414414
coastal: "Coastal"
415-
coastal_wind_turbines: "Coastal wind turbines"
415+
coastal_wind_turbines: "Wind coastal"
416416
collective: "Collective heating (district heating)"
417417
collective_heat_demand: "Collective heat demand (district heating)"
418418
individual_heat_demand: "Individual heat demand"
@@ -601,11 +601,11 @@ en:
601601
energy_power_ultra_supercritical_lignite: 'Coal Lignite'
602602
energy_power_ultra_supercritical_network_gas: 'Gas conventional'
603603
energy_power_ultra_supercritical_oxyfuel_ccs_lignite: 'Lignite oxyfuel CCS'
604-
energy_power_wind_turbine_coastal: 'Wind turbines onshore coastal'
605-
energy_power_wind_turbine_inland: 'Wind turbines onshore inland'
606-
energy_power_wind_turbine_offshore: 'Wind offshore turbines'
607-
energy_power_hybrid_wind_turbine_offshore: 'Hybrid offshore wind turbines'
608-
energy_power_hybrid_wind_turbine_offshore_curtailed_electricity: 'Curtailment hybrid offshore wind turbines'
604+
energy_power_wind_turbine_coastal: 'Wind coastal'
605+
energy_power_wind_turbine_inland: 'Wind onshore'
606+
energy_power_wind_turbine_offshore: 'Wind offshore'
607+
energy_power_hybrid_wind_turbine_offshore: 'Wind offshore (hybrid)'
608+
energy_power_hybrid_wind_turbine_offshore_curtailed_electricity: 'Curtailment wind offshore (hybrid)'
609609
energy_power_wood_pellets_must_run: 'Biomass power plant (must-run)'
610610
energy_power_wood_pellets_dispatchable: 'Biomass power plant (dispatchable)'
611611
energy_power_wood_pellets_ccs_must_run: 'Biomass power plant + CCS (must-run)'
@@ -626,7 +626,7 @@ en:
626626
energy_heat_flexibility_p2h_heatpump_mt_electricity: "Converted to heat for MT district heating (heat pump)"
627627
energy_hydrogen_biomass_gasification_for_mekko: 'Biomass gasification'
628628
energy_hydrogen_biomass_gasification_ccs_for_mekko: "Biomass gasification + CCS"
629-
energy_hydrogen_electrolysis_wind_electricity_for_mekko: "Offshore wind"
629+
energy_hydrogen_electrolysis_wind_electricity_for_mekko: "Wind offshore"
630630
energy_hydrogen_hybrid_electrolysis_wind_electricity_for_mekko: "Hybrid offshore electrolyser"
631631
energy_hydrogen_electrolysis_solar_electricity_for_mekko: "Solar PV"
632632
energy_hydrogen_flexibility_p2g_electricity_for_mekko: "Power-to-gas"
@@ -637,7 +637,7 @@ en:
637637
energy_hydrogen_autothermal_reformer_ccs_must_run_for_mekko: "ATR + CCS (must-run)"
638638
energy_hydrogen_autothermal_reformer_must_run_for_mekko: "ATR (must-run)"
639639
energy_hydrogen_autothermal_reformer_dispatchable_for_mekko: "ATR (dispatchable)"
640-
energy_hydrogen_wind_turbine_offshore: "Offshore wind"
640+
energy_hydrogen_wind_turbine_offshore: "Wind offshore"
641641
energy_hydrogen_hybrid_wind_turbine_offshore: "Hybrid offshore electrolyser"
642642
energy_hydrogen_ammonia_reformer_must_run_for_mekko: "Ammonia reformer (must-run)"
643643
energy_hydrogen_ammonia_reformer_dispatchable_for_mekko: "Ammonia reformer (dispatchable)"
@@ -826,7 +826,7 @@ en:
826826
households_solar_pv: 'Households'
827827
households_solar_pv_curtailed_electricity_output_curve: 'Curtailment households'
828828
households_solar_pv_electricity_output_curve: 'Production households'
829-
households_solar_pv_solar_radiation: 'Solar panels households'
829+
households_solar_pv_solar_radiation: 'Solar rooftop (households)'
830830
households_space_heater_coal: "Coal-fired heater"
831831
households_space_heater_combined_hydrogen: "Condensing combi boiler (hydrogen)"
832832
households_space_heater_combined_network_gas: "Condensing combi boiler (gas)"
@@ -926,16 +926,16 @@ en:
926926
energy_imported_hydrogen_backup: "Hydrogen import (backup)"
927927
energy_imported_hydrogen_baseload : "Hydrogen import (baseload)"
928928
energy_greengas_production_costs: "Average production costs green gas"
929-
energy_power_solar_pv: "Solar PV plants"
930-
energy_battery_wind_electricity: "Wind turbines onshore inland with battery"
931-
energy_battery_wind_turbine_inland: "Onshore wind turbines with battery"
932-
energy_battery_solar_pv: "Solar PV plants with battery"
933-
energy_power_solar_pv_curtailed_electricity_output_curve: "Curtailment solar PV plants"
934-
energy_power_solar_pv_electricity_output_curve: "Production solar PV plants"
935-
energy_power_solar_pv_offshore_curtailed_electricity_output_curve: "Curtailment solar PV plants offshore"
936-
energy_power_solar_pv_offshore_electricity_output_curve: "Production solar PV plants offshore"
937-
energy_battery_solar_pv_electricity_output_curve: "Production solar PV plants with battery"
938-
energy_battery_solar_pv_curtailed_electricity_output_curve: "Curtailment solar PV plants with battery"
929+
energy_power_solar_pv: "Solar on land"
930+
energy_battery_wind_electricity: "Wind onshore (battery)"
931+
energy_battery_wind_turbine_inland: "Wind onshore (battery)"
932+
energy_battery_solar_pv: "Solar on land (battery)"
933+
energy_power_solar_pv_curtailed_electricity_output_curve: "Curtailment solar on land"
934+
energy_power_solar_pv_electricity_output_curve: "Production solar on land"
935+
energy_power_solar_pv_offshore_curtailed_electricity_output_curve: "Curtailment solar offshore"
936+
energy_power_solar_pv_offshore_electricity_output_curve: "Production solar offshore"
937+
energy_battery_solar_pv_electricity_output_curve: "Production solar on land (battery)"
938+
energy_battery_solar_pv_curtailed_electricity_output_curve: "Curtailment solar on land (battery)"
939939
greengas_price: "Green gas price"
940940
hydrogen_demand: "Hydrogen demand"
941941
hydrogen_price: "Hydrogen price"
@@ -1103,8 +1103,8 @@ en:
11031103
local_chp_biogas: "Biogas CHP (must-run)"
11041104
local_electrolysis: "Local electrolysis"
11051105
locally_produced_heat: "Locally produced heat"
1106-
local_solar_pv_households: "Solar PV Households"
1107-
local_solar_pv_buildings: "Solar PV Buildings"
1106+
local_solar_pv_households: "Solar rooftop (households)"
1107+
local_solar_pv_buildings: "Solar rooftop (buildings)"
11081108
losses_of_export: "Losses for export"
11091109
low_voltage_network: "Low voltage network"
11101110
lpg: "LPG"
@@ -1269,9 +1269,9 @@ en:
12691269
number_of_excess_events: "Number of excess electricity events per year"
12701270
offshore: "Offshore"
12711271
offshore_net: "Offshore net"
1272-
offshore_wind_turbines: "Offshore wind turbines"
1273-
offshore_hybrid_wind_turbines: "Offshore hybrid wind turbines"
1274-
hybrid_offshore_wind_output_capacity: "Offshore hybrid wind turbines"
1272+
offshore_wind_turbines: "Wind offshore"
1273+
offshore_hybrid_wind_turbines: "Wind offshore (hybrid)"
1274+
hybrid_offshore_wind_output_capacity: "Wind offshore (hybrid)"
12751275
hybrid_offshore_electrolyser_input_capacity: "Offshore electrolyser"
12761276
hybrid_offshore_cable_input_capacity: "Offshore electricity cable"
12771277
oil: "Oil"
@@ -1293,7 +1293,7 @@ en:
12931293
oily_biomass: "Oil-containing biomass"
12941294
old_residences: "Old residences"
12951295
onshore: "Onshore"
1296-
onshore_wind_turbines: "Onshore wind turbines"
1296+
onshore_wind_turbines: "Wind onshore"
12971297
operation_maintenance_cost: "Operation & maintenance cost"
12981298
opex: "OPEX"
12991299
optimal_threshold: "Cost-optimal threshold"
@@ -1368,17 +1368,17 @@ en:
13681368
ships: "Domestic navigation"
13691369
salt_cavern: "Salt cavern"
13701370
solar: "Solar"
1371-
solar_csp: "Solar CSP plant"
1371+
solar_csp: "Concentrated solar power"
13721372
solar_panels: "Solar panels"
13731373
solar_pv: "Solar PV (stacked)"
1374-
solar_pv_households: "Solar PV households"
1374+
solar_pv_households: "Solar rooftop (households)"
13751375
solar_pvt_households: "Solar PVT households"
1376-
solar_pv_buildings: "Solar PV buildings"
1377-
solar_pv_onshore: "Solar PV plants onshore"
1378-
solar_pv_energy_power_solar_pv_solar_radiation_production: "Solar PV plants onshore"
1379-
solar_pv_households_solar_pv_solar_radiation_production: "Solar PV households"
1380-
solar_pv_buildings_solar_pv_solar_radiation_production: "Solar PV buildings"
1381-
solar_pv_energy_power_solar_pv_offshore_production: "Solar PV plants offshore"
1376+
solar_pv_buildings: "Solar rooftop (buildings)"
1377+
solar_pv_onshore: "Solar on land"
1378+
solar_pv_energy_power_solar_pv_solar_radiation_production: "Solar on land"
1379+
solar_pv_households_solar_pv_solar_radiation_production: "Solar rooftop (households)"
1380+
solar_pv_buildings_solar_pv_solar_radiation_production: "Solar rooftop (buildings)"
1381+
solar_pv_energy_power_solar_pv_offshore_production: "Solar offshore"
13821382
solar_pv_total_curtailed_electricity_curve: "Curtailment of solar PV"
13831383
solar_thermal: "Solar thermal"
13841384
solar_thermal_hot_water: "Solar thermal (for hot water)"
@@ -1619,9 +1619,9 @@ en:
16191619
nuclear_power_for_electricity_network_mekko: "Nuclear power plant"
16201620
oil_power_for_electricity_network_mekko: "Oil power plant"
16211621
solar_csp_for_electricity_network_mekko: "Solar CSP"
1622-
solar_pv_offshore_for_electricity_network_mekko: "Solar PV offshore"
1623-
solar_pv_on_land_for_electricity_network_mekko: "Solar PV onshore"
1624-
solar_pv_roof_for_electricity_network_mekko: "Solar PV on roof"
1622+
solar_pv_offshore_for_electricity_network_mekko: "Solar offshore"
1623+
solar_pv_on_land_for_electricity_network_mekko: "Solar on shore"
1624+
solar_pv_roof_for_electricity_network_mekko: "Solar rooftop"
16251625
waste_chp_for_electricity_network_mekko: "Waste CHP"
16261626
waste_power_for_electricity_network_mekko: "Waste power plant"
16271627
wind_offshore_for_electricity_network_mekko: "Wind offshore"

config/locales/interface/output_element_series/nl_labels.yml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ nl:
302302
buildings_solar_pv: 'Gebouwen'
303303
buildings_solar_pv_curtailed_electricity_output_curve: 'Productieverlaging gebouwen'
304304
buildings_solar_pv_electricity_output_curve: 'Opwek gebouwen'
305-
buildings_solar_pv_solar_radiation: 'Zonnepanelen gebouwen'
305+
buildings_solar_pv_solar_radiation: 'Zon op dak (gebouwen)'
306306
busses: "Bussen"
307307
capaciteit_bezet_mva: "Capaciteit - gebruikt [MVA]"
308308
capaciteit_totaal_mva: "Capaciteit - totaal [MVA]"
@@ -387,7 +387,7 @@ nl:
387387
coal_to_heat: "Kolenketel"
388388
coal_trains: "Kolentreinen"
389389
coastal: "Kust"
390-
coastal_wind_turbines: "Windmolens aan de kust"
390+
coastal_wind_turbines: "Wind aan kust"
391391
collective: "Collectieve verwarming (warmtenet)"
392392
collective_heat_demand: "Collectieve warmtevraag (warmtenetten)"
393393
individual_heat_demand: "Individuele warmtevraag"
@@ -567,22 +567,22 @@ nl:
567567
energy_power_nuclear_gen3_uranium_oxide: 'Kern 3e Gen'
568568
energy_power_nuclear_small_modular_reactor_uranium_oxide: 'Kern kleine modulaire reactor'
569569
energy_power_solar_csp_solar_radiation: 'Geconcentreerde zonne-energie'
570-
energy_power_solar_pv: 'Zonnecentrales PV'
570+
energy_power_solar_pv: 'Zon op land'
571571
energy_power_wood_pellets_must_run: 'Biomassacentrale (must-run)'
572572
energy_power_wood_pellets_dispatchable: 'Biomassacentrale (regelbaar)'
573573
energy_power_wood_pellets_ccs_must_run: 'Biomassacentrale + CCS (must-run)'
574574
energy_power_wood_pellets_ccs_dispatchable: 'Biomassacentrale + CCS (regelbaar)'
575-
energy_battery_solar_pv: "Zonnecentrales PV met batterij"
576-
energy_battery_wind_turbine_inland: 'Windmolens op land met batterij'
577-
energy_battery_wind_electricity: 'Windmolens op land met batterij'
575+
energy_battery_solar_pv: "Zon op land (batterij)"
576+
energy_battery_wind_turbine_inland: 'Wind op land (batterij)'
577+
energy_battery_wind_electricity: 'Wind op land (batterij)'
578578
energy_power_solar_pv_curtailed_electricity_output_curve: 'Productieverlaging zonneparken'
579579
energy_power_solar_pv_offshore_curtailed_electricity_output_curve: 'Productieverlaging zonneparken op zee'
580580
energy_power_solar_pv_electricity_output_curve: 'Opwek zonneparken'
581581
energy_power_solar_pv_offshore_electricity_output_curve: 'Opwek zonneparken op zee'
582582
energy_battery_solar_pv_electricity_output_curve: 'Opwek zonneparken met batterij'
583583
energy_battery_solar_pv_curtailed_electricity_output_curve: 'Productieverlaging zonneparken met batterij'
584-
energy_power_solar_pv_solar_radiation: 'Zonnecentrales PV'
585-
energy_power_offshore_solar_pv: 'Zonnecentrales PV op zee'
584+
energy_power_solar_pv_solar_radiation: 'Zon op land'
585+
energy_power_offshore_solar_pv: 'Zon op zee'
586586
energy_power_supercritical_coal: 'Kolen conventioneel'
587587
energy_power_supercritical_waste_mix: 'Afvalverbranding'
588588
energy_power_supercritical_ccs_waste_mix: 'Afvalverbranding CCS'
@@ -595,10 +595,10 @@ nl:
595595
energy_power_ultra_supercritical_lignite: 'Bruinkolen'
596596
energy_power_ultra_supercritical_network_gas: 'Gas conventioneel'
597597
energy_power_ultra_supercritical_oxyfuel_ccs_lignite: "Bruinkolen 'oxyfuel' CCS"
598-
energy_power_wind_turbine_coastal: 'Windmolens aan kust'
599-
energy_power_wind_turbine_inland: 'Windmolens op land'
600-
energy_power_wind_turbine_offshore: 'Windmolens op zee'
601-
energy_power_hybrid_wind_turbine_offshore: 'Hybride windmolens op zee'
598+
energy_power_wind_turbine_coastal: 'Wind aan kust'
599+
energy_power_wind_turbine_inland: 'Wind op land'
600+
energy_power_wind_turbine_offshore: 'Wind op zee'
601+
energy_power_hybrid_wind_turbine_offshore: 'Wind op zee (hybride)'
602602
energy_power_hybrid_wind_turbine_offshore_curtailed_electricity: 'Productieverlaging hybride windmolens op zee'
603603
energy_export_hydrogen_baseload_for_mekko: 'Export (basislast)'
604604
energy_export_hydrogen_backup_for_mekko: 'Export (overschot)'
@@ -614,8 +614,8 @@ nl:
614614
energy_hydrogen_electrolysis_solar_electricity_for_mekko: "Zonnecentrales"
615615
energy_hydrogen_flexibility_p2g_electricity_for_mekko: "Power-to-gas"
616616
energy_hydrogen_solar_pv_solar_radiation: "Zonnecentrales"
617-
energy_power_solar_pv_offshore: "Zonnecentrales op zee"
618-
energy_power_offshore_solar_pv: "Zonnecentrales op zee"
617+
energy_power_solar_pv_offshore: "Zon op zee"
618+
energy_power_offshore_solar_pv: "zon op zee"
619619
energy_hydrogen_steam_methane_reformer_ccs_must_run_for_mekko: "SMR + CCS (must-run)"
620620
energy_hydrogen_steam_methane_reformer_must_run_for_mekko: "SMR (must-run)"
621621
energy_hydrogen_steam_methane_reformer_dispatchable_for_mekko: "SMR (regelbaar)"
@@ -837,7 +837,7 @@ nl:
837837
households_solar_pv: 'Huishoudens'
838838
households_solar_pv_curtailed_electricity_output_curve: 'Productieverlaging huishoudens'
839839
households_solar_pv_electricity_output_curve: 'Opwek huishoudens'
840-
households_solar_pv_solar_radiation: 'Zonnepanelen huishoudens'
840+
households_solar_pv_solar_radiation: 'Zon op dak (huishoudens)'
841841
households_space_heater_coal: "Kolenketel"
842842
households_space_heater_combined_hydrogen: "HR combiketel (waterstof)"
843843
households_space_heater_combined_network_gas: "HR combiketel (gas)"
@@ -1279,9 +1279,9 @@ nl:
12791279
number_of_excess_events: "Aantal keer elektriciteitsoverschotten per jaar"
12801280
offshore: "Op zee"
12811281
offshore_net: "Net op zee"
1282-
offshore_wind_turbines: "Windmolens op zee"
1283-
offshore_hybrid_wind_turbines: "Hybride windmolens op zee"
1284-
hybrid_offshore_wind_output_capacity: "Hybride windturbines op zee"
1282+
offshore_wind_turbines: "Wind op zee"
1283+
offshore_hybrid_wind_turbines: "Wind op zee (hybride)"
1284+
hybrid_offshore_wind_output_capacity: "Wind op zee (hybride)"
12851285
hybrid_offshore_electrolyser_input_capacity: "Elektrolyser op zee"
12861286
hybrid_offshore_cable_input_capacity: "Elektriciteitskabel op zee"
12871287
oil: "Olie"
@@ -1303,7 +1303,7 @@ nl:
13031303
oily_biomass: "Oliehoudende biomassa"
13041304
old_residences: "Oude woningen"
13051305
onshore: "Op land"
1306-
onshore_wind_turbines: "Windmolens op land"
1306+
onshore_wind_turbines: "Wind op land"
13071307
operation_maintenance_cost: "Onderhoud en beheer"
13081308
opex: "OPEX"
13091309
optimal_threshold: "Kostenoptimaal omslagpunt"
@@ -1378,25 +1378,25 @@ nl:
13781378
salt_cavern: "Zoutcaverne"
13791379
ships: "Binnenvaartschepen"
13801380
solar: "Zon"
1381-
solar_pv_buildings: "Zon op dak gebouwen"
1382-
solar_csp: "Zon CSP"
1383-
solar_pv_households: "Zon op dak huishoudens"
1384-
solar_pvt_households: "Zon-PVT op dak huishoudens"
1381+
solar_pv_buildings: "Zon op dak (gebouwen)"
1382+
solar_csp: "Concentrated solar power"
1383+
solar_pv_households: "Zon op dak (huishoudens)"
1384+
solar_pvt_households: "Zon-PVT op dak (huishoudens)"
13851385
solar_pv_onshore: "Zon op land"
13861386
solar_panels: "Zonnepanelen"
13871387
solar_pv: "Zon PV (gestapeld)"
1388-
solar_pv_energy_power_solar_pv_solar_radiation_production: "Zon op veld"
1389-
solar_pv_households_solar_pv_solar_radiation_production: "Zon op dak huishoudens"
1390-
solar_pv_buildings_solar_pv_solar_radiation_production: "Zon op dak gebouwen"
1388+
solar_pv_energy_power_solar_pv_solar_radiation_production: "Zon op land"
1389+
solar_pv_households_solar_pv_solar_radiation_production: "Zon op dak (huishoudens)"
1390+
solar_pv_buildings_solar_pv_solar_radiation_production: "Zon op dak (gebouwen)"
13911391
solar_pv_energy_power_solar_pv_offshore_production: "Zon op zee"
13921392
solar_pv_total_curtailed_electricity_curve: "Productiebeperking zon PV"
13931393
solar_thermal: "Zonthermie"
13941394
solar_thermal_hot_water: "Zonthermie (voor warm water)"
13951395
solar_thermal_heating: "Zonthermie (voor verwarming)"
13961396
solar_thermal_heaters: "Zonneboilers"
13971397
solar_termal_heat_production: "Zonthermie warmteproductie"
1398-
solar_thermal_households: "Zonthermie op dak huishoudens"
1399-
solar_thermal_buildings: "Zonthermie op dak gebouwen"
1398+
solar_thermal_households: "Zonthermie op dak (huishoudens)"
1399+
solar_thermal_buildings: "Zonthermie op dak (gebouwen)"
14001400
solid_biomass: "Vaste biomassa"
14011401
space_heating: "Ruimteverwarming"
14021402
steam_methane_reforming: "Aardgas reforming"

0 commit comments

Comments
 (0)