Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 9362)
+++ /trunk/data/defaultpresets.xml	(revision 9363)
@@ -4195,5 +4195,5 @@
             <reference ref="name_operator" />
             <reference ref="wheelchair" />
-            <combo key="type" text="Type" values="audio,video" />
+            <combo key="studio" text="Type" values="audio,radio,television,video" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Recording Studio -->
Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 9362)
+++ /trunk/data/validator/deprecated.mapcss	(revision 9363)
@@ -632,2 +632,12 @@
   fixChangeKey: "amenity => shop";
 }
+
+/* #12311 */
+*[amenity=studio][type=audio],
+*[amenity=studio][type=radio],
+*[amenity=studio][type=television],
+*[amenity=studio][type=video] {
+  throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
+  suggestAlternative: "studio";
+  fixChangeKey: "type => studio";
+}