Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 15003)
+++ trunk/data/validator/combinations.mapcss	(revision 15004)
@@ -267,5 +267,6 @@
 }
 
-/* {0.key} together with {1.key}, #17604 */
+/* {0.key} together with {1.key}, #17630, #17604 */
+*[building:part][building],
 *[addr:street][addr:place] {
   throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}");
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 15003)
+++ trunk/data/validator/deprecated.mapcss	(revision 15004)
@@ -1421,2 +1421,15 @@
   fixRemove: "{0.key}";
 }
+
+/* #17593 */
+*[sport=football] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "sport=soccer";
+  suggestAlternative: "sport=american_football";
+  suggestAlternative: "sport=australian_football";
+  suggestAlternative: "sport=canadian_football";
+  suggestAlternative: "sport=rugby_league";
+  suggestAlternative: "sport=rugby_union";
+  suggestAlternative: "sport=gaelic_games";
+  group: tr("deprecated tagging");
+}
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java	(revision 15003)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java	(revision 15004)
@@ -63,5 +63,5 @@
         if (!r.hasTag("restriction", SUPPORTED_RESTRICTIONS)) {
             errors.add(TestError.builder(this, Severity.ERROR, UNKNOWN_RESTRICTION)
-                    .message(tr("Unknown restriction"))
+                    .message(tr("Unknown turnrestriction"))
                     .primitives(r)
                     .build());
@@ -116,5 +116,5 @@
                 default:
                     errors.add(TestError.builder(this, Severity.WARNING, UNEXPECTED_ROLE)
-                            .message(tr("Unexpected role ''{0}'' in restriction", m.getRole()))
+                            .message(tr("Unexpected role ''{0}'' in turnrestriction", m.getRole()))
                             .primitives(l)
                             .highlight(m.getMember())
@@ -135,5 +135,5 @@
                 } else {
                     errors.add(TestError.builder(this, Severity.WARNING, UNEXPECTED_ROLE)
-                            .message(tr("Unexpected role ''{0}'' in restriction", m.getRole()))
+                            .message(tr("Unexpected role ''{0}'' in turnrestriction", m.getRole()))
                             .primitives(l)
                             .highlight(m.getMember())
@@ -142,5 +142,5 @@
             } else {
                 errors.add(TestError.builder(this, Severity.WARNING, UNEXPECTED_TYPE)
-                        .message(tr("Unexpected member type in restriction"))
+                        .message(tr("Unexpected member type in turnrestriction"))
                         .primitives(l)
                         .highlight(m.getMember())