Index: /trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- /trunk/resources/data/validator/deprecated.mapcss	(revision 18544)
+++ /trunk/resources/data/validator/deprecated.mapcss	(revision 18545)
@@ -2387,3 +2387,16 @@
 }
 
+/* #22335 */
+*[toilet][!toilets] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "toilets";
+  group: tr("deprecated tagging");
+  fixChangeKey: "toilet => toilets";
+}
+*[toilet][toilets] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "toilets";
+  group: tr("deprecated tagging");
+}
+
 /* When tags are deprecated they should be added to ignoretags.cfg too. */
Index: /trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- /trunk/resources/data/validator/ignoretags.cfg	(revision 18544)
+++ /trunk/resources/data/validator/ignoretags.cfg	(revision 18545)
@@ -731,4 +731,5 @@
 E:voltage-high
 E:voltage-low
+E:toilet
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated)