Index: applications/editors/josm/i18n/po/sl.po
===================================================================
--- applications/editors/josm/i18n/po/sl.po	(revision 19557)
+++ applications/editors/josm/i18n/po/sl.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 23:20-0500\n"
-"PO-Revision-Date: 2010-01-18 13:32-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 21:54+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2010-01-13 18:28+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -71,11 +71,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -236,5 +236,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -248,13 +248,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -263,5 +263,8 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -287,5 +290,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr ""
@@ -314,5 +317,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -379,9 +382,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -389,5 +392,7 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "V redu"
@@ -438,6 +443,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -455,5 +460,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -462,11 +467,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -503,5 +508,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "konflikt"
@@ -632,14 +637,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopiraj izbrane predmete v odložišče"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Izberite predmete, ki jih želite kopirati."
@@ -670,8 +675,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -680,5 +685,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -740,15 +745,10 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Napake pri sprejemu"
-msgstr[1] "Napake pri sprejemu"
-msgstr[2] "Napake pri sprejemu"
-msgstr[3] "Napake pri sprejemu"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -769,4 +769,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -776,4 +778,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Podvoji izbrano z zaporednima ukazoma kopiraj in prilepi."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Podvoji"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Pomakni izbranega člana vrstico višje."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr ""
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Povečava na {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -864,12 +894,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 msgid "The selected way has nodes outside of the downloaded data region."
 msgid_plural ""
 "The selected ways have nodes outside of the downloaded data region."
-msgstr[0] "Izbrana pot ne vsebuje izbranega vozlišča."
-msgstr[1] "Izbrana pot ne vsebuje izbranih vozlišč."
-msgstr[2] "Izbrana pot ne vsebuje izbranih vozlišč."
-msgstr[3] "Izbrana pot ne vsebuje izbranih vozlišč."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -988,5 +1015,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr ""
@@ -1136,5 +1163,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr ""
 
@@ -1148,11 +1175,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Odpri datoteko."
-msgstr[1] "Odpri datoteko."
-msgstr[2] "Odpri datoteko."
-msgstr[3] "Odpri datoteko."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1208,7 +1233,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"When one or more ways are selected, the shape is adjusted such, that all "
-"angles are 90 or 180 degrees.<h3>You can add two nodes to the selection. "
-"Then, the direction is fixed by these two reference nodes.(Afterwards, you "
+"<h3>When one or more ways are selected, the shape is adjusted such, that all "
+"angles are 90 or 180 degrees.</h3>You can add two nodes to the selection. "
+"Then, the direction is fixed by these two reference nodes. (Afterwards, you "
 "can undo the movement for certain nodes:<br>Select them and press the "
 "shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
@@ -1222,5 +1247,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Premakne vozlišča tako, da so koti med njimi 90 ali 270 stopinj"
 
@@ -1256,4 +1282,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
 msgid "Orthogonalize"
@@ -1267,4 +1297,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204
 msgid "Selected Elements cannot be orthogonalized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
 msgstr ""
 
@@ -1371,18 +1411,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1407,12 +1447,13 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:66
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:82
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Napaka"
@@ -1543,5 +1584,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1738,11 +1779,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Razmnoži {0} vozlišč v {1} vozlišč"
-msgstr[1] "Razmnoži {0} vozlišč v {1} vozlišč"
-msgstr[2] "Razmnoži {0} vozlišč v {1} vozlišč"
-msgstr[3] "Razmnoži {0} vozlišč v {1} vozlišč"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1786,5 +1825,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr ""
@@ -2200,6 +2239,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2316,5 +2355,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Iskanje predmetov."
@@ -2496,5 +2535,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Iskanje"
@@ -2534,12 +2573,11 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "J"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
@@ -2547,10 +2585,10 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2560,9 +2598,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2695,11 +2733,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Spremeni {0} predmetov"
-msgstr[1] "Spremeni {0} predmet"
-msgstr[2] "Spremeni {0} predmeta"
-msgstr[3] "Spremeni {0} predmete"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2749,12 +2785,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Odstrani \"{0}\" pri {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Nastavi {0}={1} pri {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2812,17 +2848,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Način za brisanje"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Izbrana GPS sled: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Izbriši izbrano relacijo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2900,11 +2936,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Spremeni {0} predmetov"
-msgstr[1] "Spremeni {0} predmet"
-msgstr[2] "Spremeni {0} predmeta"
-msgstr[3] "Spremeni {0} predmete"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -2957,6 +2991,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
@@ -2971,7 +3003,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Naj res izbrišem izbor iz relacije {0}?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3216,5 +3248,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3222,5 +3254,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3228,5 +3260,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3234,5 +3266,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3352,19 +3384,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3373,5 +3405,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3379,5 +3411,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3455,7 +3487,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:327
-#, fuzzy
 msgid "The \"to\" way does not start or end at a \"via\" node."
-msgstr "Izbrana pot ne vsebuje izbranega vozlišča."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
@@ -3501,6 +3532,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3512,5 +3543,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3523,7 +3554,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3547,5 +3578,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "ozadje"
@@ -3689,6 +3720,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3696,37 +3727,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "nepopoln"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "cesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "železnica"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "vodotok"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "raba tal"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3737,10 +3769,10 @@
 msgstr[3] "{0} točke"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3751,5 +3783,5 @@
 msgstr[3] "{0} člani"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3786,6 +3818,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Spor"
@@ -3796,7 +3828,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "Povezava ni uspela."
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
@@ -3993,5 +4024,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Pripravljanje"
@@ -4032,5 +4062,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4041,5 +4071,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Uredi"
@@ -4110,29 +4140,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Geografska dolžina pod kazalcem miške."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr "Ime predmeta pod kazalcem miške."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Geografska širina pod kazalcem miške."
 
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+msgid "The angle between the previous and the current way segment."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
-msgid "The angle between the previous and the current way segment."
+msgid "The (compass) heading of the line segment being drawn."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
-msgid "The (compass) heading of the line segment being drawn."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4140,9 +4170,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(ni predmeta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4302,11 +4332,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "konflikt"
-msgstr[1] "konflikt"
-msgstr[2] "konflikt"
-msgstr[3] "konflikt"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
@@ -4316,6 +4344,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4370,16 +4396,16 @@
 msgstr "Odpravljanje sporov"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4575,8 +4601,12 @@
 msgstr "Vozlišče"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr "Združi vozlišča v najstarejšega"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4611,6 +4641,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4628,6 +4656,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4728,5 +4754,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr ""
@@ -4772,5 +4798,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -4900,10 +4931,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "brez"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr ""
@@ -4933,7 +4964,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-#, fuzzy, java-format
+#, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "Izbrana pot ne vsebuje izbranega vozlišča."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -4983,7 +5014,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -4993,6 +5024,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5172,10 +5203,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5195,18 +5226,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Razreši"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5238,8 +5269,9 @@
 msgid ""
 "<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions won't be applied unless all differences<br>are "
-"resolved.Click <strong>{0}</strong> to close anyway."
-"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<br>Conflict resolutions will not be applied unless all differences<br>are "
+"resolved.<br>Click <strong>{0}</strong> to close anyway."
+"<strong>Already<br>resolved differences will not be applied.</"
+"strong><br>Click <strong>{1}</strong> to return to resolving conflicts.</"
+"html>"
 msgstr ""
 
@@ -5262,5 +5294,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5269,5 +5301,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5347,43 +5379,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Plasti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 msgid "Open a list of all loaded layers."
 msgstr "Odpri seznam vseh naloženih plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Prikaži/skrij"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
 msgid "Toggle visible state of the selected layer."
 msgstr "Preklopi vidljivost izbrane plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Podvoji izbrano pot."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 msgid "Move the selected layer one row up."
 msgstr "Pomakni izbrano plast vrstico višje."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Pomakni izbrano plast vrstico nižje."
@@ -5397,6 +5434,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relacije"
@@ -5406,69 +5443,69 @@
 msgstr "Odpri seznam vseh relacij."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Odpri urejevalnik za izbrano relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Izbriši izbrano relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Ustvari novo relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Trenutni izbor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Odpri okno s seznamom izbora"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Povečava na izbrane predmete"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Povečava na ves izbor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5476,5 +5513,5 @@
 msgstr "Izbor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5738,6 +5775,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
@@ -5827,8 +5862,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. -->
 #. <space />
 #. <key key="highway" value="construction" />
@@ -5900,4 +5933,7 @@
 #. <space />
 #. <key key="waterway" value="drain" />
+#. item "Water/Water/Ditch" label "Edit Ditch"
+#. <space />
+#. <key key="waterway" value="ditch" />
 #. item "Water/Water/Stream" label "Edit Stream"
 #. <space />
@@ -5976,6 +6012,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6017,6 +6054,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. item "Airport/Airport Ground" label "Edit Airport Ground"
 #. <key key="aeroway" value="aerodrome" />
+#. item "Airport/Terminal" label "Edit Terminal"
+#. <key key="aeroway" value="terminal" />
 #. item "Travel/Accomodation/Hotel" label "Edit Hotel"
 #. <key key="tourism" value="hotel" />
@@ -6485,152 +6524,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 build/trans_presets.java:1960
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: build/trans_presets.java:2068 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Naziv"
@@ -7013,5 +7054,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<različno>"
@@ -7070,55 +7111,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Latnosti: {0} / Članstva: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Lastnosti / Članstva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Spremeni relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Naj res izbrišem izbor iz relacije {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Izbriši izbrani ključ vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Dodaj nov par ključ/vrednost vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Spremeni vrednost izbranega ključa vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7158,6 +7199,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
@@ -7441,6 +7480,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
@@ -7564,47 +7601,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Zaznamki"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:185
 msgid "Add a bookmark for the currently selected download area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:201
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:253
 msgid "Please enter a name for the bookmarked download area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:202
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:254
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217
 msgid "Remove the currently selected bookmarks"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr ""
@@ -7727,18 +7763,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7749,34 +7785,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Vnesite ime kraja, ki ga želite poiskati:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:112
 msgid "Enter a place name to search for"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:148
 msgid "Areas around places"
 msgstr ""
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7787,7 +7823,9 @@
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
 #. <key key="highway" value="crossing" />
+#. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
 #. item "Man Made/Pipeline" text "Operator"
+#. item "Man Made/Surveillance" text "Name"
 #. item "Man Made/Power Generator" label "Edit Power Generator"
 #. <key key="power" value="generator" />
@@ -7796,10 +7834,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Vrsta"
@@ -7808,5 +7847,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7818,17 +7857,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "neznan"
@@ -8173,5 +8211,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr ""
@@ -8536,6 +8574,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
@@ -8594,6 +8630,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
@@ -8616,9 +8650,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Unclassified" check "Passing Places"
 #. item "Highways/Streets/Residential" check "Embankment"
 #. item "Highways/Streets/Living Street" check "Embankment"
 #. item "Highways/Streets/Pedestrian" check "Embankment"
-#. item "Highways/Streets/Service" check "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8628,7 +8662,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
+#. item "Water/Water/Ditch" text "Name"
 #. item "Water/Water/Stream" text "Name"
 #. item "Water/Water/Canal" text "Name"
@@ -8640,16 +8674,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Plast"
@@ -9062,68 +9096,68 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "točka GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Use global settings."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
 msgid "Draw lines between points for this layer."
 msgstr "Riši povezave med točkami na tej plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
 msgid "Do not draw lines between points for this layer."
 msgstr "Ne riši povezav med točkami na tej plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Prilagodi barvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Privzeto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Izberite barvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Uvozi zvok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9133,23 +9167,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Zvočne datoteke (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Uvozi slike"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9159,5 +9193,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9165,5 +9199,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9171,5 +9205,5 @@
 msgstr "Opis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9179,23 +9213,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Opis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9204,5 +9238,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9211,10 +9245,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Pretvori v podatkovno plast"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9222,43 +9256,43 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Sprejmi iz OSM vzdolž te sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Sprejmi vse znotraj:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9269,9 +9303,9 @@
 "nadaljevati?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9279,5 +9313,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9285,23 +9319,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "izven sprejetega področja"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9310,5 +9344,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9322,5 +9356,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9333,11 +9367,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9346,32 +9380,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} je sestavljen iz:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Pretvori v plast GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9424,28 +9458,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "Točke GPS sledi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Datoteke GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Napaka pri razčlenjevanju {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Ni bilo možno prebrati \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9454,34 +9487,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9489,64 +9522,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9555,48 +9588,46 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9605,5 +9636,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9611,41 +9642,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
-msgstr "Izbrana pot ne vsebuje izbranega vozlišča."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
 "one."
-msgstr "Izbrana pot ne vsebuje izbranega vozlišča."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9654,5 +9683,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9661,65 +9690,63 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Berem {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Slike z geografskim položajem"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Ni naloženih podatkov."
-msgstr[1] "Ni naloženih podatkov."
-msgstr[2] "Ni naloženih podatkov."
-msgstr[3] "Ni naloženih podatkov."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -9727,13 +9754,11 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9742,5 +9767,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9833,5 +9858,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -9839,5 +9864,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9846,29 +9871,29 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9876,17 +9901,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Prikaži/skrij besedilo/ikone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
 msgid ""
 "You need to drag the play head near to the GPX track whose associated sound "
@@ -9894,5 +9919,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:225
 msgid ""
 "You need to SHIFT-drag the play head onto an audio marker or onto the track "
@@ -9900,5 +9925,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr ""
@@ -9924,5 +9949,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -9930,5 +9955,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -9980,8 +10005,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize URL:"
-msgstr "Avtor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10071,8 +10094,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize now"
-msgstr "Avtor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10131,7 +10152,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "Povezava ni uspela."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10211,8 +10231,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
-#| msgid "Please select at least four nodes."
 msgid "Please select an authorization procedure: "
-msgstr "Prosim, izberite vsaj 4 vozlišča."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10534,5 +10552,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Prosim izberite vrstico za urejanje."
@@ -10546,5 +10564,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10681,9 +10699,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10713,6 +10726,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr ""
@@ -10751,8 +10764,8 @@
 msgstr "Enobarvno (barvo poimenovanih plasti je mogoče prilagoditi po meri)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Avtomobil"
@@ -10774,13 +10787,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Kolo"
@@ -10813,12 +10826,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr ""
@@ -10870,11 +10883,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
-#, fuzzy
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
 "draw all lines."
 msgstr ""
-"Največja razdalja (v metrih) med točkama, da med njima potegne črto. "
-"Nastavite ''-1'' za povezavo vseh točk."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
@@ -11777,5 +11787,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11783,18 +11800,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11805,16 +11822,16 @@
 msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -11825,18 +11842,17 @@
 msgstr[3] "Spremeni {0} predmete"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Uporabi prednastavitev"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Spremeni lastnosti"
@@ -12112,6 +12128,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12136,9 +12152,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12161,7 +12177,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
@@ -12233,5 +12255,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr ""
@@ -12332,11 +12354,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Spremeni {0} predmetov"
-msgstr[1] "Spremeni {0} predmet"
-msgstr[2] "Spremeni {0} predmeta"
-msgstr[3] "Spremeni {0} predmete"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -12869,6 +12889,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
@@ -12974,6 +12992,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13046,6 +13062,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567
@@ -13241,5 +13255,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13247,8 +13260,4 @@
 "file a bug report."
 msgstr ""
-"Prišlo je do nepričakovane napake.\n"
-"\n"
-"To je vedno programerska napaka. Če uporabljate zadnjo različico \n"
-"urejevalnika JOSM, vas prosimo, da prijavite napako (podrobno, v angleščini)."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13340,6 +13349,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
 "<br>Please launch the preferences dialog and retrieve another OAuth token.</"
 "html>"
@@ -13455,6 +13464,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13463,5 +13472,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13602,4 +13611,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr ""
@@ -13690,5 +13700,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Interpolacija naslovov"
@@ -14267,5 +14277,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr ""
@@ -14422,21 +14432,21 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr ""
@@ -14468,9 +14478,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -14485,13 +14495,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr ""
@@ -14500,6 +14510,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr ""
@@ -14725,17 +14735,17 @@
 msgstr "Naloži slike v novo plast."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
 msgid "Looking for shoreline..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14779,42 +14789,41 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr ""
@@ -14870,6 +14879,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -14878,73 +14887,73 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of segments per way"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Ločljivost ploščic Landsat (pikslov na stopinjo)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Velikost ploščic Landsat (pikslov)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Direction to search for land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Tag ways as"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "Plast WMS"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Source text"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14952,5 +14961,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14958,5 +14967,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14964,5 +14973,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14970,53 +14979,53 @@
 "Ločljivost ploščic Landsat, merjena v pikslih na stopinjo. Privzeto 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Direction to search for land. Default east."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
 msgid "Downloading image tile..."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr ""
@@ -15040,5 +15049,5 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr ""
@@ -15069,5 +15078,5 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr ""
@@ -15142,5 +15151,5 @@
 msgstr "Kot med dvema izbranima vozliščema"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr ""
@@ -15397,4 +15406,74 @@
 #: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:135
 msgid "Firefox executable"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+msgid "Read error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Vpišite koordinate novega vozlišča."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Ohrani varnostne kopije datotek"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Napaka"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Vpisanega časa ni bilo mogoče razpoznati."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Hkrati preimenuj datoteko"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Ohrani varnostne kopije datotek"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Ohrani varnostne kopije datotek"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Prepiši"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+msgid "Could not delete temporary file!"
 msgstr ""
 
@@ -15668,6 +15747,6 @@
 msgstr "Vsako minuto shrani zajete podatke v datoteko."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:65
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:81
 #, java-format
 msgid "Error while exporting {0}: {1}"
@@ -15789,72 +15868,128 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+msgid "Terrace a house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+#, fuzzy
+msgid "Interpolation"
+msgstr "Interpolacija naslovov"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Ceste"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Številke ploščic"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Številke ploščic"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+msgid "Lowest housenumber of the terraced house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Ustvari novo relacijo"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Izbriši vozlišča ali poti"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Ime ceste"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+msgid "Cannot reverse!"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
 msgid "Reverse Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr ""
@@ -16088,5 +16223,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Podvojena vozlišča"
@@ -16096,5 +16231,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16103,9 +16238,9 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16140,5 +16275,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr ""
@@ -16283,7 +16418,7 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -16291,80 +16426,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16372,86 +16507,86 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Izbriši izbrani vir iz seznama."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Viri podatkov"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Preveri vrednosti lastnosti."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Uporabi privzeto datoteko."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Uporabi privzeto datoteko (priporočeno)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Uporabi privzeto datoteko za črkovanje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Uporabi privzeto datoteko za črkovanje (priporočeno)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Popravi lastnosti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -16891,5 +17026,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -16900,63 +17035,63 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
-msgid ""
-"The requested area is too big. Please zoom in a little, or change resolution"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
 msgid "Download visible tiles"
 msgstr "Naloži vidne ploščice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+msgid ""
+"The requested area is too big. Please zoom in a little, or change resolution"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Spremeni ločljivost"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Shrani plast WMS v datoteko"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "Naloži plast WMS iz datoteke"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Nepodprta različica datoteke WMS; našel {0}, pričakoval {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17207,6 +17342,13 @@
 msgstr ""
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17215,15 +17357,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17232,10 +17374,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17244,15 +17386,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17262,10 +17404,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17274,5 +17416,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17281,10 +17423,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17391,6 +17533,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. item "Airport/Runway" label "Edit Runway"
+#. <key key="aeroway" value="runway" />
 #. <optional>
+#. item "Airport/Taxiway" label "Edit Taxiway"
+#. <key key="aeroway" value="taxiway" />
+#. <optional>
+#. item "Airport/Helipad" label "Edit Helipad"
+#. <key key="aeroway" value="helipad" />
+#. <optional>
+#. item "Airport/Gate" label "Edit Terminal Gate"
+#. <key key="aeroway" value="gate" />
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
@@ -17398,6 +17549,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr ""
@@ -17414,5 +17566,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Voznih pasov"
@@ -17434,10 +17586,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Najvišja hitrost (km/h)"
@@ -17481,14 +17633,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Enosmerna"
@@ -17531,13 +17683,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17575,13 +17727,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Predor"
@@ -17616,13 +17768,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Usek"
@@ -17657,13 +17809,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Nasip"
@@ -17794,4 +17946,13 @@
 #: build/trans_presets.java:225
 msgid "Edit Unclassified Road"
+msgstr ""
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
 msgstr ""
 
@@ -17810,15 +17971,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr ""
@@ -17830,5 +17991,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -17837,5 +17998,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr ""
@@ -17853,16 +18014,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Površina"
@@ -17884,166 +18048,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr ""
@@ -18051,5 +18222,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr ""
@@ -18058,5 +18229,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr ""
@@ -18064,5 +18235,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr ""
@@ -18071,5 +18242,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -18077,5 +18248,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr ""
@@ -18084,5 +18255,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr ""
@@ -18092,18 +18263,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr ""
@@ -18111,5 +18282,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr ""
@@ -18119,5 +18290,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -18125,5 +18296,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Cesta (neznana kategorija)"
@@ -18132,5 +18303,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Uredi cesto neznane kategorije"
@@ -18139,20 +18310,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Cestne omejitve"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Uredi cestne omejitve"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Cestnina"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Brez izhoda (slepa ulica)"
@@ -18160,9 +18331,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Dostop"
 
 #. item "Highways/Streets/Road Restrictions" combo "Access"
+#. item "Highways/Streets/Road Restrictions" combo "Agricultural"
 #. item "Highways/Streets/Road Restrictions" combo "Bicycle"
 #. item "Highways/Streets/Road Restrictions" combo "Foot"
@@ -18173,6 +18345,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18184,4 +18354,5 @@
 #. item "Ways/Path" combo "Snowmobile"
 #. item "Ways/Path" combo "Motorcar"
+#. item "Waypoints/Traffic Calming" combo "Type"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -18200,141 +18371,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "da"
+
+#. color permissive
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="private"/>
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr ""
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+msgstr ""
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:219
+msgid "destination"
+msgstr ""
+
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--restrictions tags -->
+#. <!--the restrictions rules should be placed before the path rule! -->
+#.
+#. <rule>
+#. <condition k="access" b="no"/>
+#. <icon src="vehicle/restriction/access.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="permissive"/>
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "da"
-
-#. color permissive
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="private"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr ""
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-msgstr ""
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr ""
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr ""
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -18349,10 +18528,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 build/trans_presets.java:784
+#: build/trans_presets.java:806 build/trans_presets.java:843
+#: build/trans_presets.java:856 build/trans_presets.java:868
+#: build/trans_presets.java:880 build/trans_presets.java:892
+#: build/trans_presets.java:932
 msgid "Horse"
 msgstr ""
@@ -18368,10 +18547,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr ""
@@ -18386,27 +18565,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: build/trans_presets.java:786 build/trans_presets.java:808
+#: build/trans_presets.java:845 build/trans_presets.java:858
+#: build/trans_presets.java:870 build/trans_presets.java:882
+#: build/trans_presets.java:894 build/trans_presets.java:934
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr ""
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr ""
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Najnižja hitrost (km/h)"
@@ -18414,25 +18585,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Krožišče"
@@ -18443,5 +18614,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr ""
@@ -18461,10 +18632,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr ""
@@ -18486,10 +18657,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "hitra cesta"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr ""
@@ -18511,10 +18682,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "glavna"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr ""
@@ -18536,5 +18707,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18549,9 +18720,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "regionalna (turistična)"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr ""
@@ -18565,9 +18736,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr ""
@@ -18597,10 +18768,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr ""
@@ -18630,5 +18801,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18640,10 +18811,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Uredi most"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr ""
@@ -18651,19 +18822,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Poti"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr ""
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr ""
@@ -18679,5 +18850,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "krožišče"
@@ -18685,5 +18856,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr ""
@@ -18692,35 +18863,34 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Vrsta"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18728,5 +18898,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18734,26 +18904,26 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
 msgstr ""
@@ -18761,5 +18931,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Steza"
@@ -18768,7 +18938,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Uredi stezo"
+
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
 
 #: build/trans_presets.java:489
@@ -18788,7 +18979,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Uredi most"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -18801,7 +18991,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Uredi kolesarsko stezo"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -18841,18 +19030,16 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Uredi pešpot"
+msgstr ""
 
 #. item "Ways/Dedicated Footway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Uredi pešpot"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -18860,5 +19047,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Stopnice"
@@ -18868,5 +19055,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Uredi stopnice"
@@ -18874,10 +19061,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Avtocestno križišče"
@@ -18885,15 +19072,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Uredi avtocestno križišče"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr ""
@@ -18901,5 +19088,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr ""
@@ -18907,5 +19094,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -18938,17 +19126,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr ""
@@ -18957,5 +19145,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Semafor"
@@ -18965,5 +19153,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -18972,27 +19160,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr ""
@@ -19000,6 +19188,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr ""
@@ -19008,11 +19196,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -19020,30 +19208,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Stop znak"
@@ -19051,5 +19239,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -19058,14 +19246,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr ""
@@ -19076,14 +19310,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Obračališče"
@@ -19093,26 +19327,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Znak za naselje"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Uredi znak za naselje"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr ""
 
 #. item "Waypoints/Speed Camera"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr ""
@@ -19120,5 +19356,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr ""
@@ -19126,5 +19362,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr ""
@@ -19132,11 +19368,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+msgid "Grit Bin"
+msgstr ""
+
+#. item "Waypoints/Grit Bin"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dgrit_bin" />
+#. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr ""
@@ -19144,5 +19387,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Gorski prelaz"
@@ -19150,5 +19393,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Uredi gorski prelaz"
@@ -19160,7 +19403,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr ""
@@ -19168,5 +19411,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Ovire"
@@ -19174,5 +19417,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "Stebriček"
@@ -19180,5 +19423,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr ""
@@ -19223,16 +19466,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr ""
@@ -19241,5 +19484,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr ""
@@ -19247,5 +19490,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Rešetka za živino"
@@ -19253,10 +19496,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr ""
@@ -19264,15 +19507,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Cestninska postaja"
@@ -19280,5 +19523,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Uredi cestninsko postajo"
@@ -19286,10 +19529,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr ""
@@ -19299,5 +19542,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr ""
@@ -19306,12 +19549,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
-msgid "Fence"
-msgstr ""
-
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#: build/trans_presets.java:817 build/trans_presets.java:819
+msgid "Fence"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr ""
@@ -19319,5 +19574,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr ""
@@ -19326,5 +19581,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr ""
@@ -19336,15 +19591,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Vrata"
@@ -19352,50 +19608,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr ""
@@ -19403,25 +19659,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr ""
@@ -19432,11 +19688,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Voda"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Izvir"
@@ -19444,5 +19700,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Uredi izvir"
@@ -19450,5 +19706,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr ""
@@ -19456,10 +19712,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Potok"
@@ -19467,10 +19734,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Uredi potok"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Kanal"
@@ -19478,10 +19745,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Uredi kanal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Reka"
@@ -19491,5 +19758,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Uredi reko"
@@ -19497,15 +19764,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Uredi vodo"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Kopno"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Uredi kopno"
@@ -19513,15 +19780,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr ""
@@ -19529,15 +19796,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -19545,5 +19812,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr ""
@@ -19552,10 +19819,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr ""
@@ -19566,14 +19833,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr ""
@@ -19587,35 +19854,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr ""
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr ""
@@ -19623,20 +19890,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr ""
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr ""
@@ -19644,10 +19911,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr ""
@@ -19655,5 +19922,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr ""
@@ -19661,5 +19928,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Pot trajekta"
@@ -19667,5 +19934,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr ""
@@ -19674,5 +19941,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "Ladjedelnica"
@@ -19680,10 +19947,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Uredi ladjedelnico"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Dók"
@@ -19691,5 +19958,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Uredi dók"
@@ -19697,5 +19964,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Jez"
@@ -19703,15 +19970,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Uredi jez"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Vodna točka"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Vodna zapornica"
@@ -19720,5 +19987,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr ""
@@ -19726,20 +19993,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Slap"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Uredi slap"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr "Obračališče"
@@ -19748,15 +20015,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Pomol"
@@ -19764,10 +20031,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Uredi pomol"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr ""
@@ -19775,10 +20042,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr ""
@@ -19788,20 +20055,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Železnica"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Železniški tir"
@@ -19809,5 +20076,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Uredi železniški tir"
@@ -19816,139 +20083,378 @@
 #. <space />
 #. <key key="railway" value="rail" />
+#. <optional>
 #. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
 #. <space />
 #. <key key="railway" value="narrow_gauge" />
+#. <optional>
+#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
+#. <space />
+#. <key key="railway" value="preserved" />
+#. <optional>
+#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
+#. <space />
+#. <key key="railway" value="light_rail" />
+#. <optional>
+#. item "Transport/Railway/Subway" label "Edit Subway"
+#. <space />
+#. <key key="railway" value="subway" />
+#. <optional>
+#. item "Transport/Railway/Tram" label "Edit Tram"
+#. <space />
+#. <key key="railway" value="tram" />
+#. <optional>
+#: build/trans_presets.java:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <optional>
+#. item "Transport/Railway/Preserved" combo "Gauge (mm)"
+#. item "Transport/Railway/Light Rail" combo "Gauge (mm)"
+#. item "Transport/Railway/Subway" combo "Gauge (mm)"
+#. item "Transport/Railway/Tram" combo "Gauge (mm)"
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+msgid "Types"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Types"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Types"
+#. item "Transport/Railway/Monorail" combo "Types"
+#. item "Transport/Railway/Preserved" combo "Types"
+#. item "Transport/Railway/Light Rail" combo "Types"
+#. item "Transport/Railway/Subway" combo "Types"
+#. item "Transport/Railway/Tram" combo "Types"
+#. item "Transport/Railway/Disused Rail" combo "Optional Types"
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr ""
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+msgid "Electrified"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Electrified"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Electrified"
+#. item "Transport/Railway/Monorail" combo "Electrified"
+#. item "Transport/Railway/Preserved" combo "Electrified"
+#. item "Transport/Railway/Light Rail" combo "Electrified"
+#. item "Transport/Railway/Subway" combo "Electrified"
+#. item "Transport/Railway/Tram" combo "Electrified"
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+msgid "contact_line"
+msgstr ""
+
+#. color foot
+#. <icon annotate="true" src="transport/steps.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="bus_guideway"/>
+#. color railwaypoint
+#. <icon annotate="true" src="vehicle/crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="rail"/>
+#. color oldrail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="narrow_gauge"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="monorail"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="turntable"/>
+#. <icon annotate="true" src="transport/turntable.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color rail
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="funicular"/>
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Line reference"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#: build/trans_presets.java:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Voltage"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Voltage"
+#. item "Transport/Railway/Monorail" combo "Voltage"
+#. item "Transport/Railway/Preserved" combo "Voltage"
+#. item "Transport/Railway/Light Rail" combo "Voltage"
+#. item "Transport/Railway/Subway" combo "Voltage"
+#. item "Transport/Railway/Tram" combo "Voltage"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Tir ozkotirne železnice"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Uredi tir ozkotirne železnice"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr ""
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr ""
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr ""
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Podzemna"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Uredi podzemno"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr ""
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Nerabljen tir"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Uredi nerabljen tir"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "Vrsta (neobvezno)"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr ""
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Tir ozkotirne železnice"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Uredi tir ozkotirne železnice"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr ""
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr ""
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr ""
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr ""
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr ""
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr ""
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Podzemna"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Uredi podzemno"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr ""
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr ""
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Nerabljen tir"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Uredi nerabljen tir"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Zapuščeni tir"
@@ -19957,5 +20463,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr ""
@@ -19964,5 +20470,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr ""
@@ -19972,5 +20478,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr ""
@@ -19978,5 +20484,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Okretnica"
@@ -19985,10 +20491,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+msgid "Buffer Stop"
+msgstr ""
+
+#. item "Transport/Railway/Buffer Stop"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
+#. <key key="railway" value="buffer_stop" />
+#: build/trans_presets.java:1289
 msgid "Aerialway"
 msgstr "Žičnica"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Sedežnica"
@@ -19996,10 +20509,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Uredi sedežnico"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Vlečnica"
@@ -20007,10 +20520,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Uredi vlečnico"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Kabinska žičnica"
@@ -20018,10 +20531,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Uredi kabinsko žičnico"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr ""
@@ -20029,10 +20542,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20040,12 +20553,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Gorivo"
@@ -20055,9 +20581,66 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Uredi gorivo"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20111,32 +20694,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr ""
@@ -20195,94 +20778,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20294,5 +20953,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20302,5 +20961,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Uredi parkirišče"
@@ -20311,25 +20970,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20338,48 +20997,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr ""
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr ""
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr ""
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr ""
@@ -20387,5 +21046,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Izposojevalnica"
@@ -20394,10 +21053,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Uredi izposojevalnico avtomobilov"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr ""
@@ -20405,5 +21064,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr ""
@@ -20411,10 +21070,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr ""
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr ""
@@ -20423,15 +21082,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Uredi izposojevalnico koles"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Javni prevoz"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20441,5 +21100,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20447,5 +21106,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr ""
@@ -20453,5 +21112,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Železniško postajališče"
@@ -20459,5 +21118,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr ""
@@ -20465,5 +21124,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr ""
@@ -20472,5 +21131,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr ""
@@ -20478,5 +21137,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Železniški peron"
@@ -20485,5 +21144,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Uredi železniški peron"
@@ -20495,5 +21154,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr ""
@@ -20501,10 +21160,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Vhod v podzemno"
@@ -20513,10 +21172,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Uredi vhod v podzemno"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr ""
@@ -20525,5 +21184,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Avtobusna postaja"
@@ -20532,5 +21191,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Uredi avtobusno postajo"
@@ -20538,5 +21197,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Avtobusno postajališče"
@@ -20546,5 +21205,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Uredu avtobusno postajališče"
@@ -20553,25 +21212,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr ""
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Klopca"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "Avtobusni peron"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "Uredi avtobusni peron"
@@ -20579,5 +21239,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Taksi"
@@ -20585,5 +21245,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Uredi postajališče taksijev"
@@ -20591,32 +21251,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Letališče"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr ""
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr ""
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr ""
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+msgid "Edit Helipad"
+msgstr ""
+
+#. item "Airport/Helipad" text "Reference"
+#. </optional>
+#. item "Airport/Apron"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
+msgid "Apron"
+msgstr ""
+
+#. item "Airport/Apron" label "Apron"
+#. <key key="aeroway" value="apron" />
+#. item "Airport/Hangar"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+msgid "Hangar"
+msgstr ""
+
+#. item "Airport/Hangar" label "Hangar"
+#. <key key="building" value="hangar" />
+#. item "Airport/Beacon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
+#. item "Man Made/Crane" text "Name"
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr ""
+
+#. item "Airport/Beacon" label "Beacon"
+#. <key key="man_made" value="beacon" />
+#. item "Airport/Windsock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
+#: build/trans_presets.java:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Nastanitev"
@@ -20628,5 +21383,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -20635,15 +21390,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr ""
@@ -20651,20 +21406,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr ""
@@ -20672,10 +21427,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr ""
@@ -20683,30 +21438,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr ""
@@ -20714,10 +21469,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Hrana in pijača"
@@ -20728,5 +21483,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -20734,5 +21489,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr ""
@@ -20740,5 +21495,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr ""
@@ -20746,61 +21501,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr ""
@@ -20808,9 +21575,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr ""
@@ -20818,9 +21593,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Pivnica"
@@ -20828,18 +21603,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Uredi pivnico"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr ""
@@ -20847,9 +21622,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr ""
@@ -20857,24 +21632,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr ""
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Turizem"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Muzej"
@@ -20882,9 +21657,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Uredi muzej"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Živalski vrt"
@@ -20893,9 +21668,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Uredi živalski vrt"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Razgledišče"
@@ -20903,24 +21678,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Uredi razgledišče"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Umetnina"
@@ -20928,5 +21703,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Uredi umetnino"
@@ -20934,19 +21709,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Zemljevid"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -20984,5 +21759,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -20990,28 +21765,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr ""
@@ -21021,5 +21796,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr ""
@@ -21027,5 +21802,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr ""
@@ -21033,6 +21808,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Kolesarjenje"
@@ -21040,5 +21815,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -21046,6 +21821,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Smučanje"
@@ -21053,5 +21828,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -21059,46 +21834,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21106,29 +21881,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr ""
@@ -21136,25 +21911,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Zgodovinski kraji"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Grad"
@@ -21163,19 +21938,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Uredi grad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Ruševine"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Uredi ruševine"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Arheološko najdišče"
@@ -21184,9 +21959,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Uredi arheološko najdišče"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr ""
@@ -21194,10 +21969,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21205,5 +21980,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21211,15 +21986,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr ""
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr ""
@@ -21227,55 +22002,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Prosti čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Vodni park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Uredi vodni park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Igrišče"
@@ -21283,35 +22058,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Uredi igrišče"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Ribarjenje"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Uredi ribarjenje"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Uredi stadion"
@@ -21325,6 +22100,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "izberite šport:"
@@ -21716,6 +22491,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -21749,225 +22524,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "lokostrelstvo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "košarka"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "plezanje"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "kolesarjenje"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "gimnastika"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "strelišče"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "smučanje"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "nogomet"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "plavanje"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "namizni_tenis"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Športno središče"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Uredi športno središče"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Golf igrišče"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Uredi golf igrišče"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Uredi mini golf"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr ""
@@ -22006,21 +22781,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "vrsta"
@@ -22059,203 +22834,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Lokostrelstvo"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Uredi lokostrelstvo"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Plezanje"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Uredi plezanje"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Uredi kolesarjenje"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Pasje dirke"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Uredi pasje dirke"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "Konjske dirke"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "Uredi konjske dirke"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Gimnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "Uredi gimnastiko"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Plavanje"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Uredi plavanje"
@@ -22263,56 +23038,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "Uredi smučanje"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Strelišče"
@@ -22320,182 +23091,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Uredi strelišče"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Šport (z žogo)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Nogomet"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Uredi nogomet"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr ""
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Košarka"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Uredi košarko"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Uredi golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "golf_igrišče"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Uredi hokej"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Namizni tenis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Uredi namizni tenis"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Uredi tenis"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Zgradbe"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Zgradba"
@@ -22503,5 +23274,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Javne zgradbe"
@@ -22509,10 +23280,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Uredi javno zgradbo"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Mestna hiša"
@@ -22520,10 +23291,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Uredi mestno hišo"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Veleposlaništvo"
@@ -22531,10 +23302,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Uredi veleposlaništvo"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Sodišče"
@@ -22543,10 +23314,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Uredi sodišče"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Zapor"
@@ -22555,10 +23326,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Uredi zapor"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Policijska postaja"
@@ -22568,10 +23339,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Uredi policijsko postajo"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Gasilski dom"
@@ -22580,10 +23351,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Uredi gasilski dom"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Pošta"
@@ -22591,5 +23362,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Uredi pošto"
@@ -22597,15 +23368,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Šola"
@@ -22613,10 +23384,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Uredi šolo"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr ""
@@ -22624,10 +23395,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr ""
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr ""
@@ -22635,5 +23406,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr ""
@@ -22641,5 +23412,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Kinematograf"
@@ -22648,10 +23419,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Uredi kinematograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Knjižnica"
@@ -22660,9 +23431,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Uredi knjižnico"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr ""
@@ -22670,10 +23441,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Gledališče"
@@ -22682,10 +23453,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Uredi gledališče"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Kraj čaščenja"
@@ -22695,5 +23466,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Uredi kraj čaščenja"
@@ -22702,6 +23473,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Vera"
@@ -22710,66 +23481,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr ""
@@ -22778,81 +23549,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Naslovi"
@@ -22861,5 +23632,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Urejanje podatkov o naslovu"
@@ -22867,5 +23638,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr ""
@@ -22873,25 +23644,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Ime ceste"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Poštna številka"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr ""
@@ -22900,5 +23671,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Uredi interpolacijo naslovov"
@@ -22906,61 +23677,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Stolp"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Uredi stolp"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr ""
@@ -22968,25 +23739,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Vodni stolp"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Uredi vodni stolp"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Svetilnik"
@@ -22994,10 +23765,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Uredi svetilnik"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Mlin na veter"
@@ -23005,10 +23776,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Uredi mlin na veter"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Cevovod"
@@ -23017,37 +23788,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Uredi cevovod"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr ""
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Čistilna naprava"
@@ -23057,10 +23828,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Uredi čistilno napravo"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Žerjav"
@@ -23068,21 +23839,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Uredi žerjav"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr ""
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Geodetska točka"
@@ -23090,10 +23856,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Uredi geodetsko točko"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Video nadzor"
@@ -23101,11 +23867,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Uredi video nadzorno kamero"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr ""
@@ -23115,35 +23893,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr ""
@@ -23152,10 +23930,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr ""
@@ -23164,5 +23942,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -23170,10 +23948,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Steber daljnovoda"
@@ -23184,23 +23962,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Uredi steber daljnovoda"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr ""
@@ -23209,79 +23987,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr ""
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Stranišča"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Poštni nabiralnik"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Telefon"
@@ -23290,5 +24063,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Uredi telefon"
@@ -23296,5 +24069,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Kovanci"
@@ -23302,5 +24075,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Bankovci"
@@ -23308,5 +24081,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -23314,5 +24087,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Debetne kartice"
@@ -23320,15 +24093,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Kreditne kartice"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Telefonske kartice"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Recikliranje"
@@ -23337,5 +24110,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Uredi raciklažno točko"
@@ -23343,31 +24116,42 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+msgid "Edit Waste Basket"
 msgstr ""
 
@@ -23375,31 +24159,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr ""
@@ -23478,5 +24262,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -23486,31 +24270,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -23519,30 +24303,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr ""
@@ -23551,10 +24335,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Pitna voda"
@@ -23563,10 +24347,23 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Uredi pitno vodo"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+msgid "Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
+#: build/trans_presets.java:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr ""
@@ -23574,15 +24371,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Trgovine"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23590,10 +24387,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23602,28 +24399,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr ""
@@ -23631,9 +24428,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr ""
@@ -23641,27 +24438,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Prodajni avtomat"
@@ -23669,5 +24466,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Uredi prodajni avtomat"
@@ -23675,88 +24472,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Prodajani izdelki"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "pijača"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "SIM kartice"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Mesar"
@@ -23764,9 +24561,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Uredi mesarja"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Pekarna"
@@ -23774,9 +24571,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Uredi pekarno"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr ""
@@ -23784,18 +24581,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr ""
@@ -23803,54 +24600,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr ""
@@ -23858,9 +24655,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr ""
@@ -23868,9 +24665,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Sam svoj mojster"
@@ -23878,54 +24675,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Uredi sam svoj mojster trgovino"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr ""
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Čistilnica"
@@ -23933,9 +24730,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Uredi čistilnico"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Pralnica"
@@ -23943,9 +24740,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Uredi pralnico"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr ""
@@ -23953,28 +24750,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Denar"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Banka"
@@ -23982,14 +24779,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Uredi banko"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Menjalnica"
@@ -23997,5 +24794,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Uredi menjalnico"
@@ -24003,15 +24800,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Uredi bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Zdravje"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr ""
@@ -24019,18 +24816,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr ""
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Lekarna"
@@ -24038,5 +24835,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Uredi lekarno"
@@ -24044,9 +24841,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Bolnišnica"
@@ -24054,10 +24851,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Uredi bolnišnico"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr ""
@@ -24066,5 +24863,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -24073,20 +24870,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -24094,5 +24891,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr ""
@@ -24101,64 +24898,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr ""
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Kraji"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Uredi kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Država"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Uredi državo"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr ""
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr ""
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr ""
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr ""
@@ -24166,15 +24963,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr ""
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr ""
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr ""
@@ -24182,10 +24979,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr ""
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr ""
@@ -24193,25 +24990,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Vas"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Uredi vas"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Zaselek"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Uredi zaselek"
@@ -24219,5 +25016,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr ""
@@ -24225,10 +25022,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Otok"
@@ -24236,10 +25033,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Uredi otok"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -24247,5 +25044,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -24253,5 +25050,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr ""
@@ -24259,10 +25056,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Vrh"
@@ -24270,10 +25067,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Uredi vrh"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr ""
@@ -24281,10 +25078,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr ""
@@ -24292,70 +25089,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Meje"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr ""
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr ""
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Raba tal"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Drevo"
@@ -24364,15 +25161,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Uredi drevo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr ""
@@ -24381,5 +25178,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr ""
@@ -24387,17 +25184,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Gozd"
@@ -24406,14 +25203,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Uredi gozdnata tla"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Naravni rezervat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Uredi naravni rezervat"
@@ -24421,25 +25218,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr ""
@@ -24447,10 +25244,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr ""
@@ -24458,5 +25255,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr ""
@@ -24464,5 +25261,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr ""
@@ -24471,45 +25268,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Vinograd"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Uredi vinograd"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -24517,25 +25314,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr ""
@@ -24543,10 +25340,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr ""
@@ -24554,20 +25351,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr ""
@@ -24575,5 +25372,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -24581,15 +25378,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Pokopališče"
@@ -24597,9 +25394,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Uredi pokopališče"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr ""
@@ -24607,39 +25404,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr ""
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "Ozemlje železnice"
@@ -24647,15 +25444,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "Uredi ozemlje železnice"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr ""
@@ -24663,50 +25460,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Gradbišče"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Kamnolom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Uredi kamnolom"
@@ -24716,5 +25513,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr ""
@@ -24723,10 +25520,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr ""
@@ -24734,5 +25531,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr ""
@@ -24741,5 +25538,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -24747,34 +25544,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr ""
@@ -24783,15 +25580,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr ""
@@ -24799,5 +25596,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr ""
@@ -24806,5 +25603,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr ""
@@ -24812,5 +25609,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr ""
@@ -24901,5 +25698,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -24909,17 +25706,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr ""
@@ -24979,5 +25776,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -24986,9 +25783,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr ""
@@ -25002,10 +25799,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr ""
@@ -25013,31 +25810,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr ""
@@ -25046,106 +25843,31 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 msgid "backward halt point"
-msgstr ""
-
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_style.java:72
-msgid "standard"
 msgstr ""
 
@@ -25681,77 +26403,4 @@
 #: build/trans_style.java:975 build/trans_style.java:983
 msgid "highway_track"
-msgstr ""
-
-#. color foot
-#. <icon annotate="true" src="transport/steps.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="bus_guideway"/>
-#. color railwaypoint
-#. <icon annotate="true" src="vehicle/crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="rail"/>
-#. color oldrail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="narrow_gauge"/>
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="monorail"/>
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="turntable"/>
-#. <icon annotate="true" src="transport/turntable.png"/>
-#. color rail
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="buffer_stop"/>
-#. <icon annotate="true" src="transport/buffer_stop.png"/>
-#. color rail
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="platform"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. color rail
-#. color rail
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
 msgstr ""
 
@@ -26140,7 +26789,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "Mreža"
+msgstr ""
 
 #. color manmade
@@ -29279,12 +29927,105 @@
 msgstr ""
 
-#~ msgid "Cycleway"
-#~ msgstr "Kolesarska steza"
-
-#~ msgid "Footway"
-#~ msgstr "Pešpot"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parameter ''{0}'' ne sme biti ničen"
+#~ msgid "Move"
+#~ msgstr "Premakni"
+
+#~ msgid "Data Layer"
+#~ msgstr "Podatkovna plast"
+
+#~ msgid "No data imported."
+#~ msgstr "Nič podatkov ni bilo uvoženih."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Najprej izberite zaznamek."
+
+#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
+#~ msgstr "Ni mogoče razbrati časa \"{0}\" točke {1} x {2}"
+
+#~ msgid "No time for point {0} x {1}"
+#~ msgstr "Točka {0} x {1} nima časovne oznake"
+
+#~ msgid "Image"
+#~ msgstr "Slika"
+
+#~ msgid "Sync clock"
+#~ msgstr "Uskladi uro"
+
+#~ msgid "The date in file \"{0}\" could not be parsed."
+#~ msgstr "Datuma v datoteki \"{0}\" ni bilo možno razbrati."
+
+#~ msgid "There is no EXIF time within the file \"{0}\"."
+#~ msgstr "V datoteki \"{0}\" manjka EXIF čas."
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "Ni možno odpreti imenika z nastavitvami: {0}"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Neshranjene spremembe"
+
+#~ msgid "their version:"
+#~ msgstr "njihova različica:"
+
+#~ msgid "my version:"
+#~ msgstr "moja različica:"
+
+#~ msgid "Object"
+#~ msgstr "Predmet"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} objektov s konflikti:"
+#~ msgstr[1] "{0} objekt s konfliktom:"
+#~ msgstr[2] "{0} objekta s konflikti:"
+#~ msgstr[3] "{0} objekti s konflikti:"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Uporabniško ime (email) vašega računa pri OSM."
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje."
+
+#~ msgid "Enter Password"
+#~ msgstr "Vnesite geslo"
+
+#~ msgid "position"
+#~ msgstr "položaj"
+
+#~ msgid "different"
+#~ msgstr "različno"
+
+#~ msgid "false"
+#~ msgstr "napačno"
+
+#~ msgid "true"
+#~ msgstr "pravilno"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Dokument ni odprt, zato ni kaj shraniti."
+
+#~ msgid "Email"
+#~ msgstr "E-pošta"
+
+#~ msgid "Load Selection"
+#~ msgstr "Naloži izbrano"
+
+#~ msgid "Contact {0}..."
+#~ msgstr "Kontaktiraj {0}..."
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Spori pri zlivanju"
+
+#~ msgid "No images with readable timestamps found."
+#~ msgstr "Ni moč najti slik z berljivo časovno oznako."
+
+#~ msgid "GPS start: {0}"
+#~ msgstr "Začetek GPS sledi: {0}"
+
+#~ msgid "current delta: {0}s"
+#~ msgstr "trenutna razlika: {0}s"
+
+#~ msgid "GPS end: {0}"
+#~ msgstr "Konec GPS sledi: {0}"
 
 #~ msgid "image"
@@ -29295,106 +30036,4 @@
 #~ msgstr[3] "slike"
 
-#~ msgid "Move"
-#~ msgstr "Premakni"
-
-#~ msgid "Data Layer"
-#~ msgstr "Podatkovna plast"
-
-#~ msgid "No data imported."
-#~ msgstr "Nič podatkov ni bilo uvoženih."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Najprej izberite zaznamek."
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Ni mogoče razbrati časa \"{0}\" točke {1} x {2}"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Točka {0} x {1} nima časovne oznake"
-
-#~ msgid "Image"
-#~ msgstr "Slika"
-
-#~ msgid "Sync clock"
-#~ msgstr "Uskladi uro"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Datuma v datoteki \"{0}\" ni bilo možno razbrati."
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "V datoteki \"{0}\" manjka EXIF čas."
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Ni možno odpreti imenika z nastavitvami: {0}"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Neshranjene spremembe"
-
-#~ msgid "their version:"
-#~ msgstr "njihova različica:"
-
-#~ msgid "my version:"
-#~ msgstr "moja različica:"
-
-#~ msgid "Object"
-#~ msgstr "Predmet"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objektov s konflikti:"
-#~ msgstr[1] "{0} objekt s konfliktom:"
-#~ msgstr[2] "{0} objekta s konflikti:"
-#~ msgstr[3] "{0} objekti s konflikti:"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Uporabniško ime (email) vašega računa pri OSM."
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje."
-
-#~ msgid "Enter Password"
-#~ msgstr "Vnesite geslo"
-
-#~ msgid "position"
-#~ msgstr "položaj"
-
-#~ msgid "different"
-#~ msgstr "različno"
-
-#~ msgid "false"
-#~ msgstr "napačno"
-
-#~ msgid "true"
-#~ msgstr "pravilno"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Dokument ni odprt, zato ni kaj shraniti."
-
-#~ msgid "Email"
-#~ msgstr "E-pošta"
-
-#~ msgid "Load Selection"
-#~ msgstr "Naloži izbrano"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Kontaktiraj {0}..."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Spori pri zlivanju"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Ni moč najti slik z berljivo časovno oznako."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "Začetek GPS sledi: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "trenutna razlika: {0}s"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "Konec GPS sledi: {0}"
-
 #~ msgid "timezone difference: "
 #~ msgstr "razlika časovnih pasov: "
@@ -29402,7 +30041,4 @@
 #~ msgid "{0} within the track."
 #~ msgstr "{0} znotraj sledi."
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Vpisanega časa ni bilo mogoče razpoznati."
 
 #~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
@@ -29478,15 +30114,15 @@
 #~ msgstr "Uredi postajo"
 
-#~ msgid "Station"
-#~ msgstr "Postaja"
-
 #~ msgid "zoom"
 #~ msgstr "povečava"
 
-#~ msgid "help"
-#~ msgstr "pomoč"
-
 #~ msgid "Help / About"
 #~ msgstr "Pomoč / O programu"
+
+#~ msgid "Cycleway"
+#~ msgstr "Kolesarska steza"
+
+#~ msgid "Footway"
+#~ msgstr "Pešpot"
 
 #~ msgid "AgPifoJ - Geotagged pictures"
@@ -29587,7 +30223,4 @@
 #~ msgstr "Izbrana možnost javno objavi sled na openstreetmap.org"
 
-#~ msgid "Public"
-#~ msgstr "Javna"
-
 #~ msgid "Update Data"
 #~ msgstr "Posodobitev podatkov"
@@ -29674,4 +30307,7 @@
 #~ msgstr "parameter '{0}' ne sme biti ničen"
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "parameter ''{0}'' ne sme biti ničen"
+
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Ni bilo možno prebrati \"{0}\""