diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index 8f9bf10..5b0dfaf 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -119,7 +119,7 @@
         <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 09:30,11:00|Sa,Su,PH 09:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     </chunk>
     <chunk id="oh">
-        <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00, Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+        <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00, Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" values_no_i18n="true" />
     </chunk>
     <chunk id="wheelchair">
         <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
@@ -4555,7 +4555,7 @@
             <key key="amenity" value="post_box" />
             <text key="operator" text="Operator" />
             <text key="ref" text="Reference number" />
-            <combo key="collection_times" text="Collection times" delimiter="|" values="Mo-Sa 09:00|Mo-Fr 17:30; Sa 12:00|Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30" />
+            <combo key="collection_times" text="Collection times" delimiter="|" values="Mo-Sa 09:00|Mo-Fr 17:30; Sa 12:00|Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30" values_no_i18n="true" />
             <check key="drive_through" text="Drive through" />
         </item> <!-- Post Box -->
         <item name="Telephone" icon="presets/telephone.png" type="node" preset_name_label="true">
diff --git a/data/tagging-preset.xsd b/data/tagging-preset.xsd
index e8b7ca6..b776445 100644
--- a/data/tagging-preset.xsd
+++ b/data/tagging-preset.xsd
@@ -203,6 +203,7 @@
 		<attribute name="values" type="string" />
 		<attribute name="values_from" type="string" />
 		<attribute name="values_context" type="string" />
+		<attribute name="values_no_i18n" type="boolean" />
 		<attribute name="display_values" type="string" />
 		<attribute name="values_searchable" type="boolean" />
 		<attribute name="default" type="string" />
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
index 96a4149..6ed776c 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
@@ -991,6 +991,8 @@ public String toString() {
         public String values_from;
         /** The context used for translating {@link #values} */
         public String values_context;
+        /** Disabled internationalisation for value to avoid mistakes, see #11696 */
+        public boolean values_no_i18n;
         public String display_values;
         /** The localized version of {@link #display_values}. */
         public String locale_display_values;
@@ -1115,8 +1117,11 @@ private void initListEntriesFromAttributes() {
                 value_array = splitEscaped(delChar, values);
             }
 
-            final String displ = Utils.firstNonNull(locale_display_values, display_values);
-            String[] display_array = displ == null ? value_array : splitEscaped(delChar, displ);
+            String[] display_array = value_array;
+            if (!values_no_i18n) {
+                final String displ = Utils.firstNonNull(locale_display_values, display_values);
+                display_array = displ == null ? value_array : splitEscaped(delChar, displ);
+            }
 
             final String descr = Utils.firstNonNull(locale_short_descriptions, short_descriptions);
             String[] short_descriptions_array = descr == null ? null : splitEscaped(delChar, descr);
@@ -1136,7 +1141,7 @@ private void initListEntriesFromAttributes() {
             final List<PresetListEntry> entries = new ArrayList<>(value_array.length);
             for (int i = 0; i < value_array.length; i++) {
                 final PresetListEntry e = new PresetListEntry(value_array[i]);
-                e.locale_display_value = locale_display_values != null
+                e.locale_display_value = locale_display_values != null || values_no_i18n
                         ? display_array[i]
                         : trc(values_context, fixPresetString(display_array[i]));
                 if (short_descriptions_array != null) {