Changeset 19690 in josm


Ignore:
Timestamp:
2026-11-18T15:23:11+01:00 (less than one hour ago)
Author:
stoecker
Message:

fix #24532 - fix clashing translations, patch by skyper

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/resources/data/defaultpresets.xml

    r19679 r19690  
    117117    <chunk id="check_access_motor">
    118118        <optional text="Motor vehicle traffic:">
    119             <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     119            <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" />
    120120            <space />
    121121            <checkgroup columns="2">
    … …  
    252252    </chunk>
    253253    <chunk id="highway_access">
    254         <combo key="access" text="General Access" values="yes,destination,delivery,permissive,permit,private,customers,agricultural,forestry,no" values_sort="false" />
     254        <combo key="access" text="General Access" values="yes,destination,delivery,permissive,permit,private,customers,agricultural,forestry,no" values_context="access" values_sort="false" />
    255255    </chunk>
    256256    <chunk id="highway_access_vehicle">
    257257        <reference ref="highway_access" />
    258         <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     258        <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" />
    259259    </chunk>
    260260    <chunk id="POI_access">
    … …  
    268268        <space />
    269269        <label text="Tags which are implied and do not need to be set are `motor_vehicle=no` and `emergency=destination`." />
    270         <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
    271         <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     270        <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" />
     271        <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" match="key" />
    272272    </chunk>
    273273    <chunk id="fee">
    … …  
    11551155            <space />
    11561156            <label text="Transport mode restrictions" />
    1157             <combo key="access" text="General Access" values="yes,destination,delivery,permissive,permit,private,customers,agricultural,forestry,no" values_searchable="true" values_sort="false" match="key" />
     1157            <combo key="access" text="General Access" values="yes,destination,delivery,permissive,permit,private,customers,agricultural,forestry,no" values_context="access" values_searchable="true" values_sort="false" match="key" />
    11581158            <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,permit,private,use_sidepath,no" values_sort="false" match="key" />
    11591159            <reference ref="wheelchair" />
    … …  
    11631163            <space />
    11641164            <label text="Vehicles per type" />
    1165             <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1165            <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" match="key" />
    11661166            <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,permit,private,use_sidepath,customers,no" values_sort="false" match="key" />
    11671167            <check key="cyclestreet" text="Bicycle street" disable_off="true" />
    1168             <combo key="carriage" text="Carriage" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    1169             <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    1170             <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    1171             <combo key="moped" text="Moped" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    1172             <combo key="mofa" text="Mofa" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    1173             <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    1174             <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    1175             <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    1176             <combo key="bdouble" text="B-double road train" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    1177             <combo key="agricultural" text="Agricultural Vehicles (with restrictions e.g. max. 25 km/h)" values="yes,official,designated,destination,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1168            <combo key="carriage" text="Carriage" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" match="key" />
     1169            <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" match="key" />
     1170            <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" match="key" />
     1171            <combo key="moped" text="Moped" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" match="key" />
     1172            <combo key="mofa" text="Mofa" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" match="key" />
     1173            <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" match="key" />
     1174            <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" match="key" />
     1175            <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" match="key" />
     1176            <combo key="bdouble" text="B-double road train" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" match="key" />
     1177            <combo key="agricultural" text="Agricultural Vehicles (with restrictions e.g. max. 25 km/h)" values="yes,official,designated,destination,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" match="key" />
    11781178            <combo key="4wd_only" text="4WD only" values="yes,recommended,no" values_sort="false" match="key" />
    11791179            <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
    … …  
    12551255                <reference ref="trailblazed" />
    12561256                <reference ref="highway_access" />
    1257                 <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
    1258                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
    1259                 <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
    1260                 <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     1257                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" />
     1258                <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" />
     1259                <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" />
     1260                <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" />
    12611261                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
    12621262            </optional>
    … …  
    13131313                <combo key="ski" text="Ski" values="yes,permissive,private,no" values_sort="false" />
    13141314                <combo key="snowmobile" text="Snowmobile" values="yes,permissive,destination,delivery,permit,private,no" values_sort="false" />
    1315                 <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
    1316                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1315                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" />
     1316                <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" match="key" />
    13171317            </optional>
    13181318            <reference ref="link_road_access_restrictions" />
    … …  
    13561356                <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
    13571357                <combo key="horse" text="Horse" values="yes,permissive,destination,delivery,permit,private,no" values_sort="false" />
    1358                 <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
    1359                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1358                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" />
     1359                <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" match="key" />
    13601360            </optional>
    13611361            <reference ref="link_road_access_restrictions" />
    … …  
    14191419                <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
    14201420                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
    1421                 <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
    1422                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1421                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" />
     1422                <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_context="access" values_sort="false" match="key" />
    14231423            </optional>
    14241424            <reference ref="link_road_access_restrictions" />
    … …  
    87358735        <key key="office" value="government" />
    87368736        <text key="name" text="Name" />
    8737         <combo key="government" text="Type" values="administrative,audit,cadaster,culture,customs,data_protection,education,environment,forestry,healthcare,legislative,migration,ministry,pension_fund,prosecutor,public_service,register_office,social_security,social_services,statistics,tax,transportation" />
     8737        <combo key="government" text="Type" values="administrative,audit,cadaster,culture,customs,data_protection,education,environment,forestry,healthcare,legislative,migration,ministry,pension_fund,prosecutor,public_service,register_office,social_security,social_services,statistics,tax,transportation" values_context="office" />
    87388738        <reference ref="oh_wheelchair" />
    87398739        <reference ref="link_contact_address" />
Note: See TracChangeset for help on using the changeset viewer.