Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 5535)
+++ trunk/data/defaultpresets.xml	(revision 5536)
@@ -3522,5 +3522,5 @@
             <label text="select sport:" />
             <space />
-            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" />
+            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" />
         </item>
         <item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway">
@@ -3531,5 +3531,5 @@
             <label text="select sport:" />
             <space />
-            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" />
+            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" />
         </item>
         <item name="Pitch" icon="presets/pitch.png" type="node,closedway">
@@ -3540,5 +3540,5 @@
             <label text="select sport:" />
             <space />
-            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,table_tennis,tennis" />
+            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,table_tennis,tennis" />
         </item>
         <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation">
@@ -3549,5 +3549,5 @@
             <label text="select sport:" />
             <space />
-            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,table_tennis,tennis" />
+            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,table_tennis,tennis" />
         </item>
         <item name="Golf Course" icon="presets/golf.png" type="node,closedway">
@@ -3724,10 +3724,16 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
-        <item name="Gaelic Football" icon="presets/soccer.png" type="node,closedway">
+        <item name="Gaelic Games" icon="presets/soccer.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games"/>
-            <label text="Edit Gaelic Football" />
-            <key key="sport" value="gaelic_football" />
+            <label text="Edit Gaelic Games" />
+            <key key="sport" value="gaelic_games" />
             <text key="name" text="Name" />
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+            <optional>
+                <check key="gaelic_games:hurling" text="Hurling" text_context="gaelic game" default="off" />
+                <check key="gaelic_games:football" text="Football" text_context="gaelic game"  default="off" />
+                <check key="gaelic_games:camogie" text="Camogie" text_context="gaelic game"  default="off" />
+                <check key="gaelic_games:rounders" text="Rounders" text_context="gaelic game"  default="off" />
+            </optional>
         </item>
         <item name="Rugby League" icon="presets/football.png" type="node,closedway">
Index: trunk/data/tagchecker.cfg
===================================================================
--- trunk/data/tagchecker.cfg	(revision 5535)
+++ trunk/data/tagchecker.cfg	(revision 5536)
@@ -52,4 +52,5 @@
 *    : W : highway == road                                     # temporary highway type
 *    : W : / *name */i == * && name != *                       # misspelled key name
+*    : W : sport == gaelic_football                            # gaelic_football was replaced by gaelic_games
 
 # The following could replace unnamed way check. Still at the moment we keep it as it is