Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 11262)
+++ /trunk/data/defaultpresets.xml	(revision 11263)
@@ -5410,5 +5410,5 @@
             <check key="shelter" text="Shelter" />
             <check key="hide" text="Hide" text_context="hunting stand" />
-            <check key="lock" text="Lock" />
+            <check key="lockable" text="Lockable" />
         </item> <!-- Hunting Stand -->
         <separator/>
Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 11262)
+++ /trunk/data/validator/deprecated.mapcss	(revision 11263)
@@ -1116,2 +1116,11 @@
   suggestAlternative: "tracktype=grade5";
 }
+
+/* #13953 */
+*[amenity=hunting_stand][lock=yes],
+*[amenity=hunting_stand][lock=no] {
+  throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
+  suggestAlternative: "lockable";
+  group: tr("deprecated tagging");
+  fixChangeKey: "lock => lockable";
+}