Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 17024)
+++ trunk/resources/data/defaultpresets.xml	(revision 17025)
@@ -82,5 +82,5 @@
         <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" values_context="electrified" />
         <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
-        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
+        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,25" length="5" />
         <reference ref="highway_yesno" />
     </chunk>
@@ -347,5 +347,5 @@
     </chunk>
     <chunk id="frequency">
-        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
+        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,25,50,60" length="5" />
     </chunk>
     <chunk id="voltage_frequency">
Index: trunk/resources/data/validator/combinations.mapcss
===================================================================
--- trunk/resources/data/validator/combinations.mapcss	(revision 17024)
+++ trunk/resources/data/validator/combinations.mapcss	(revision 17025)
@@ -308,4 +308,11 @@
 }
 
+/* {0.key} together with {1.tag} and {2.key}, #19747 */
+way[railway][electrified=no][frequency],
+way[railway][electrified=no][voltage] {
+  throwWarning: tr("{0} together with {1} and {2}", "{0.key}", "{1.tag}", "{2.key}");
+  group: tr("suspicious tag combination");
+}
+
 /* #11127, #13727 */
 way[waterway][bridge=yes][waterway!=weir] {