Index: applications/editors/josm/i18n/po/uk.po
===================================================================
--- applications/editors/josm/i18n/po/uk.po	(revision 22465)
+++ applications/editors/josm/i18n/po/uk.po	(revision 22569)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-22 06:56+0000\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-07-29 14:54+0000\n"
 "Last-Translator: andygol <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-07-28 09:44+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -24,5 +24,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -53,14 +53,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -77,9 +76,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -122,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -160,5 +159,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -234,5 +233,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -248,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -266,11 +265,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -278,20 +278,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../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/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -326,5 +326,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Об’єднати"
@@ -394,5 +394,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -406,5 +406,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -426,4 +426,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -440,6 +441,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -451,5 +452,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -584,22 +585,22 @@
 msgstr "Завантаження відкритих наборів змін…"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Приєднати лінію"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "З’єднати кілька ліній в одну"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Змінити напрямки?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Змінити напрямок на протилежний і з’єднати"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -609,5 +610,5 @@
 "напрямок однієї з них на протилежний?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -615,10 +616,10 @@
 msgstr "Не вдалося з’єднати лінії (Неможливо створити єдиний ланцюг з вузлів)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "З’єднати лінії — {0} шт."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Будь ласка, виберіть принаймні дві лінії для з’єднання"
@@ -664,10 +665,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -807,5 +808,5 @@
 #: ../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/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -871,10 +872,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Експортувати до GPX…"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Експортувати дані до GPX файлу."
@@ -1068,5 +1069,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1512,20 +1513,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../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:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../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:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1549,5 +1550,5 @@
 #: ../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/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1558,6 +1559,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Помилка"
@@ -1584,5 +1585,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1590,5 +1591,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Зберегти поточні дані."
@@ -1645,10 +1646,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Зберегти як…"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Зберегти поточні дані в новий файл."
@@ -1695,5 +1696,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1720,5 +1721,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Ні, скасувати"
@@ -1791,18 +1792,24 @@
 msgstr[2] "Спростити лінію (вилучити {0} точок)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Розділити лінію"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Розділити лінію у виділеній точці"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "Поточне виділення неможливо розділити."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Виділені точки не є частиною однієї лінії."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1811,5 +1818,5 @@
 msgstr[2] "Виділені точки не знаходиться в середині будь-якої лінії."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1828,21 +1835,10 @@
 "виділіть також лінію."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Виділені точки не є частиною однієї лінії."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Виділена лінія не містить виділену точку."
-msgstr[1] "Виділена лінія не містить виділених точок"
-msgstr[2] "Виділена лінія не містить всіх виділених точок"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Щоб розділити замкнену лінію, виділіть не менше двох точок."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1852,5 +1848,5 @@
 "лінії)."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1861,5 +1857,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1869,5 +1865,5 @@
 "потрібно перевірити та виправити за потреби.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -2021,5 +2017,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -3069,22 +3065,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../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/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3230,25 +3226,25 @@
 msgstr "Неможливо розв’язати невирішуваний конфлікт"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr "Потрібно вилучити, принаймні, один об’єкт, отримано порожній набір"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "Вилучити точку {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Вилучити лінію {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "Вилучити зв’язок {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3258,5 +3254,5 @@
 msgstr[2] "Вилучити {0} об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3266,5 +3262,5 @@
 msgstr[2] "Вилучити {0} точок"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3274,5 +3270,5 @@
 msgstr[2] "Вилучити {0} ліній"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3282,5 +3278,5 @@
 msgstr[2] "Вилучити {0} зв’язків"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3442,5 +3438,5 @@
 msgstr "Застосувати?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3507,25 +3503,27 @@
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
-msgstr ""
+msgstr "Не можливо створити теку {0}, автозбереження буде відключене"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
-msgstr ""
+msgstr "Не можливо створити файл {0}, буде використане інше ім’я для файлу"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Помилка читання файлів з каталогу {0}\n"
+msgstr ""
+"Помилка вводу-виводу під час створення файлу, автозбереження буде пропущене: "
+"{0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "Замінити старі резервні копії?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Помилка створення каталогу для кешу: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3721,42 +3719,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Градуси у Хвилинах Секундах"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr "Прогнозовані Координати"
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "Пд"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "Пн"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "Зх"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "Сх"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3764,5 +3765,5 @@
 msgstr "Неможливо додати елемент {0} до набору даних, так як він вже присутній"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3943,5 +3944,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "тло"
@@ -4087,5 +4088,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "Не показувати знову (запам’ятати вибір)"
@@ -4113,5 +4114,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "залізниця"
@@ -4133,6 +4134,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4202,5 +4203,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "будівля"
@@ -4288,5 +4289,5 @@
 msgstr "Об’єкт вилучено"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4389,30 +4390,30 @@
 msgstr "Пароль"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "використання"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Показати цю довідку"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Стандартний аргумент геометрії unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Завантажити ділянку в межах габаритного прямокутника"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 "Завантажити місцевість за посиланням (з параметрами lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4420,9 +4421,9 @@
 "Файл/Відкрити)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Завантажити ділянку в межах габаритного прямокутника, як дані GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
@@ -4430,33 +4431,33 @@
 "дані GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Вибір з урахуванням пошуку"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Запуск у розгорнутому вигляді"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Відновити типові налаштування"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Встановити мову"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "системні налаштування Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "ШЛЯХ/ДО/ПАПКИ/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Зміна папки для всіх налаштувань користувача"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4470,9 +4471,9 @@
 "виділеної пам’яті"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "приклади"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4482,5 +4483,5 @@
 "порядку."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
@@ -4488,42 +4489,41 @@
 "selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Ініціалізація"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Оновлення втулків…"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Встановлення оновлених втулків"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Завантаження ранніх втулків"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Типові налаштування"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Створення головного вікна"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Завантаження втулків"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Розв’язано"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr "Відновити"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4532,5 +4532,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4628,33 +4628,33 @@
 msgstr "Віддалити"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "масштаб"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Географічна довгота під вказівником миші"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Назва об’єкту під вказівником миші"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Географічна широта під вказівником миші"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "Кут між попереднім і поточним відрізком лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Подорожній кут створюваного відрізку лінії"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "Довжина створюваного відрізку лінії"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4664,9 +4664,9 @@
 "<br> Утримуйте CTRL, щоб вибрати мишею, безпосередньо зі списку.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(Немає об’єкта)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4682,4 +4682,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Шар ''{0}'' повинен бути в списку шарів"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Числовий"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "китайська"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Діловий район"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5437,5 +5452,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "всі"
@@ -5519,6 +5534,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5530,5 +5545,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5675,5 +5690,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Набори змін"
@@ -5734,5 +5749,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5900,5 +5915,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5906,5 +5921,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5912,5 +5927,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5918,5 +5933,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5924,5 +5939,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5931,5 +5946,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5937,5 +5952,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5943,5 +5958,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5949,24 +5964,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "З"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Фільтр активний</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> об’єктів приховано"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> об’єктів пошкоджено"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Закрити діалог фільтра, щоб побачити всі об’єкти.<p></html>"
@@ -6046,51 +6061,51 @@
 msgstr "Закрити діалог, не створюючи нову точку"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Шари"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Відкрити список всіх завантажених шарів."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "Вилучити вибрані шари."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Показати/приховати виділений шар."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Показати/сховати"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Показати/приховати виділений шар."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Активувати"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Активувати вибраний шар"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Об’єднати цей шар з іншим шаром"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "Дублювати шар"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Перемістити вибраний шар на один рядок вгору."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Перемістити вибраний шар на один рядок вниз."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Інформація про шар"
@@ -6100,5 +6115,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Зв’язки"
@@ -7268,6 +7283,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7315,107 +7331,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Назва"
@@ -7793,5 +7809,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7882,5 +7898,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<інший>"
@@ -8660,5 +8676,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr "Межі"
@@ -8731,8 +8747,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Тип"
@@ -8761,6 +8777,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "Невідомо"
@@ -9116,5 +9132,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:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Виявлено конфлікт"
@@ -9187,14 +9203,15 @@
 "Попередження: помилка в заголовку \"{0}\" не відповідає очікуваному шаблону"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Напишіть короткий пояснення для змін, які ви завантажуєте:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr "Введіть коментар для даних, що надсилаються на сервер (мін. 3 знаки)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Невірний коментар для надсилання на сервер"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr "Набір змін:"
@@ -9683,5 +9700,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "Надіслати"
@@ -9703,5 +9720,5 @@
 msgstr "Ініціалізація зв’язків для оновлення…"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9709,63 +9726,95 @@
 msgstr "Параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr "Вирішіть, як завантажувати дані та які використовувати набори змін"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "Теґи нового набору змін"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr "Застосувати теґи до набору змін, який надіслано на сервер"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 "Керування відкритими наборами змін та вибір наборів для надсилання на сервер"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr "Налаштування додаткових параметрів"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr "Надіслати до ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Надіслати зміни"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "Надіслати на сервер змінені елементи"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-"Будь ласка, введіть коментар для надсилання на сервер цього набору змін "
-"(мін. 3 символи)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
 msgstr "Невірний коментар для надсилання на сервер"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "У зворотному порядку"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Далі"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+#, fuzzy
+msgid "Cancel and return to the previous dialog"
+msgstr "Скасувати і повернутися у редактор"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Більше не показувати"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr "Будь ласка, спочатку введіть вірний розмір порції"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr "Невірний розмір порції"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "Відмінити надсилання даний та повернутись до редагування"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -10145,108 +10194,11 @@
 msgstr[2] "Вилучити {0} об’єктів:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "точка GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Налаштувати креслення ліній"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Використовувати загальні налаштування"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Креслити лінії між точками цього шару."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Не креслити лінії між точками цього шару."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../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:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Налаштувати колір"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Типовий"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Вибрати колір"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Позначки з іменованих точок"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Іменовані точки треку з {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Імпортувати аудіо"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-"<html>Дані в шарі GPX ''{0}'' були завантажені з сервера.<br>Так як точки не "
-"містять міток часу, ми не можемо синхронізувати їх з аудіо-даними.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr "Імпорт неможливий"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Аудіофайли Wave (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Аудіо позначки з {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Імпорт зображень"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-"<html><html>Дані в шарі GPX ''{0}'' були завантажені з сервера.<br>Так як "
-"точки не містять міток часу, ми не можемо синхронізувати їх з зображеннями.</"
-"html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -10254,5 +10206,5 @@
 msgstr "Назва: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -10260,5 +10212,5 @@
 msgstr "Опис: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -10269,23 +10221,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Опис"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr "Період"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr "Довжина"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Довжина: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -10295,5 +10247,5 @@
 msgstr[2] "{0} маршрутів, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -10303,10 +10255,10 @@
 msgstr[2] "{0} точок маршруту"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Перетворити в шар даних"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10316,21 +10268,21 @@
 "вважається шкідливим.<br>Якщо хочете завантажити треки, ознайомтеся з цим:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Перетворено з: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10338,10 +10290,10 @@
 msgstr "Завантажити з OSM дані уздовж цього треку"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Завантажити всі в межах:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10349,10 +10301,10 @@
 msgstr "{0} метрів"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Максимальна ділянка для одного запиту:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10360,21 +10312,21 @@
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr "Завантажити біля:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr "тільки треки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr "тільки дорожні точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr "треки та дорожні точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10386,9 +10338,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "На шарі відсутній трек GPX, щоб накласти звук."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10398,5 +10350,5 @@
 "пропущені або перенесені на початок треку."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10406,23 +10358,120 @@
 "розрахунку часу."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Налаштувати креслення ліній"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Використовувати загальні налаштування"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Креслити лінії між точками цього шару."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Не креслити лінії між точками цього шару."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Вибрати варіанти креслення ліній"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Налаштувати колір"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Типовий"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Вибрати колір"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Позначки з іменованих точок"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Іменовані точки треку з {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Імпортувати аудіо"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+"<html>Дані в шарі GPX ''{0}'' були завантажені з сервера.<br>Так як точки не "
+"містять міток часу, ми не можемо синхронізувати їх з аудіо-даними.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr "Імпорт неможливий"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Аудіофайли Wave (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Аудіо позначки з {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Імпорт зображень"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+"<html><html>Дані в шарі GPX ''{0}'' були завантажені з сервера.<br>Так як "
+"точки не містять міток часу, ми не можемо синхронізувати їх з зображеннями.</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Шар даних {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "по-за межами завантаженої ділянки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "версія {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "Увага: спільне використання даних версій 0.6 і 0.5 у версії 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10432,11 +10481,11 @@
 msgstr[2] "Виявлено {0} конфліктів."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr "Натисніть, щоб закрити цей діалог і продовжити редагування"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10446,36 +10495,36 @@
 msgstr[2] "{0} вилучено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} складається з:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr "відключено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "Версія API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Перетворити в шар GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr "Тест узгодженості набору даних"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr "Проблем не виявлено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr "Виявлені наступні проблеми:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10486,5 +10535,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10494,5 +10543,5 @@
 msgstr[2] "треків"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10501,5 +10550,5 @@
 msgstr[2] "точок"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10509,5 +10558,5 @@
 msgstr[2] "трек з {0} точками"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10517,5 +10566,5 @@
 msgstr[2] "{0} складається з {1} треків"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10525,24 +10574,28 @@
 msgstr[2] "{0} точок"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Відносяться до GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Файли GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Файл {0} завантажено під іменем \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Помилка синтаксичного аналізу {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Неможливо прочитати \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10554,34 +10607,34 @@
 "пояс<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Час з фото (з exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "Час GPS (зі знімку над фото): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [дд/мм/рррр гг:хх:сс]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "Я в часовому поясі: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Без дати"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Відкрити інше фото"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Синхронізуйте час з фото та GPS-приймача"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10591,21 +10644,21 @@
 "Будь ласка використовуйте формат запиту"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Невірна дата"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<GPX-трек ще не заватажено>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "Трек GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Відкрийте інший GPX-трек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
@@ -10614,72 +10667,72 @@
 "екрану GPS-приймача</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 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:517
 msgid "Matches first photo with first gpx point"
 msgstr "Перше фото припадає на першу точку gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr "Ручне налаштування"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr "Перевстановити позицію для: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Зображення з координатами місця розташування в даних exif ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Зображення, які вже позначені ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr "Показувати ескіз зображення на мапі"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Часовий пояс: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Зміщення:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Зіставити зображення з GPX треком"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "Узгодити"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Невірний часовий пояс"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "Невірне зміщення"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr "Спробувати знову"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr "Немає відповідних зображень!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr "gpx не виділено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10690,20 +10743,20 @@
 msgstr[2] "<html><b>{0}</b> з <b>{1}</b> фото відповідає треку GPX.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Часовий пояс: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Хвилини: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Секунди: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10713,5 +10766,5 @@
 msgstr[2] "Розбіжність у часі {0} днів"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10721,21 +10774,21 @@
 "вручну зіставити фотографії за допомогою повзунків."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr "Не вдалося зіставити фотографії з треком"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "Налаштування часового поясу і зсуву"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr "Вибрані фотографії не містять інформацію про час."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "Фотографії не містять інформацію про час."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10745,17 +10798,17 @@
 "інший."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "GPX Трек не має інформації про час"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "Ви повинні вибрати трек GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "Трек GPX не виділено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10766,5 +10819,5 @@
 "Очікуваний формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10775,56 +10828,52 @@
 "Очікуваний формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Видобування координат GPS з EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Запуск сканування каталогу"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr "Один з виділених файлів порожній"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Переглянути фотографії…"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Перегляд {0}…"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Не вдалося отримати канонічний шлях до каталогу {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Сканування каталогу  {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Знайдено порожній файл в каталозі {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Помилка читання файлів з каталогу {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Зображення з геотеґами"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Відносяться до GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10834,5 +10883,5 @@
 msgstr[2] "Завантажено {0} зображень."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10842,10 +10891,10 @@
 msgstr[2] "{0} знайдено, з GPS позначками."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Вилучити зображення з диску"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10856,5 +10905,5 @@
 "втрачено!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr "Не можливо вилучити файл зображення"
@@ -10956,9 +11005,9 @@
 msgstr "Зображення JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "позначка GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10967,5 +11016,5 @@
 msgstr[2] "позначок"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10975,9 +11024,22 @@
 msgstr[2] "{0} складається з {1} позначок"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+"В цьому шарі відсутні аудіо-позначки від яких можливо зробити зрушення."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr "Показати текст/значки"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Показати/приховати текст і значки."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Синхронізувати аудіо"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10986,5 +11048,5 @@
 "синхронізації."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10992,14 +11054,14 @@
 msgstr "Аудіо синхронізовано у точці {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../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:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "Встановити позначку аудіо на позиції програвання"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -11008,17 +11070,4 @@
 "Ви повинні поставити аудіо на паузу в тій точці шляху, де хочете поставити "
 "позначку."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-"В цьому шарі відсутні аудіо-позначки від яких можливо зробити зрушення."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr "Показати текст/значки"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Показати/приховати текст і значки."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11971,4 +12020,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Нічого"
@@ -11983,5 +12033,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -12085,5 +12135,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -12093,5 +12143,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Тільки на початку лінії."
@@ -12121,5 +12171,20 @@
 msgstr "Створювати мітки читаючи GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Автор"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Desc"
+msgstr "Дизельне"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Північ"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -12129,9 +12194,9 @@
 "шару."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Показувати лінії між точками GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12141,9 +12206,9 @@
 "щоб показувати всі лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Максимальна довжина для локальних файлів (в метрах)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12152,20 +12217,20 @@
 "показувати всі лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Максимальна довжина (в метрах)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Показувати лінії, навіть якщо немає імпортованої інформації про лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Показувати стрілки на лініях, що з’єднують точки GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12174,5 +12239,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12181,13 +12246,13 @@
 "Не показувати стрілки, якщо вони знаходяться близько від попередніх стрілок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Мінімальна відстань (в пікселях)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Показувати точки GPS великими."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12197,9 +12262,9 @@
 "Менеджері Шарів."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Позначати колір відрізків та точок треку в залежності від швидкості."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12209,37 +12274,46 @@
 "Ваш пристрій захоплення для цього повинен реєструвати таку інформацію."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Дозволяє настроювати забарвлення треку для різних середніх швидкостей."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Забарвлення треку та точок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "Опис точки шляху"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "Точки GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Показувати напрямок на відрізках ліній."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Показувати порядкові номери на всіх відрізках лінії."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Застосувати згладжування мапи."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Показувати межі ділянки, завантаженої з сервера."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -12247,9 +12321,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Показувати неактивні шари даних іншим кольором."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "Дані OSM"
@@ -12630,21 +12704,26 @@
 msgstr "Потрібно перезапустити JOSM, щоб зміни набрали сили."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Тип проекції"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr "Код проекції"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Показувати координати як"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Тип проекції"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr "Код проекції"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Шар для проведення вимірювань"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Картографічна проекція"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -13252,5 +13331,5 @@
 msgstr "Додати новий теґ"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -13261,49 +13340,49 @@
 "повинна бути такою ж, як і у values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Більш детальна інформація про цю функцію"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Невідомий запит: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr "Доступні ролі"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr "роль"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr "кількість"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr "елементи"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Необов’язкові атрибути:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Невідомий тип: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr "Роль елемента заготовки без батьків"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr "Вкладені елементи заготовок без батьків"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13313,15 +13392,15 @@
 msgstr "Неможливо прочитати з джерела заготовок теґів: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Помилка синтаксичного аналізу: {0} "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Елементи типу {0} підтримуються."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13332,17 +13411,17 @@
 msgstr[2] "Правка {0} об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Нічого не вибрано!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Невдалий вибір!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Застосувати заготовку"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13360,7 +13439,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Пошук: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -13369,17 +13447,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Пошук об’єктів"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Показати локалізовані назви в переліку вибору"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Пошук: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13701,5 +13776,5 @@
 msgstr "Невдалось розібрати файл ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Помилка розбору: неправильна структура документа GPX"
@@ -15319,5 +15394,5 @@
 "об’єкт.<br><br>Повідомлення про помилку:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15612,5 +15687,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:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Вставка адрес"
@@ -16044,41 +16119,41 @@
 msgstr "Більше не показувати"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr "Адреса будівлі"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr "Номер дома:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr "Вулиця:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr "Збільшення"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr "Зменшення"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr "Номери:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr "Режим великих будівель"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr "Повернути приціл"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr "Додаткові параметри"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr "Теґ будівлі:"
@@ -16095,25 +16170,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr "Встановити розмір будівель"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr "Використовувати діалог адрес"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr "Авто-вибір будівлі"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr "Ширина будинків:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr "Довжина кроку:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr "Додатково…"
@@ -16151,18 +16226,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Будівлі"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr "Наступний номер"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Вулиця"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr "Ввести адреси"
@@ -16403,8 +16478,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "вода"
@@ -16465,6 +16540,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "адреса"
@@ -16969,34 +17044,34 @@
 "Виберіть спочатку один із них, а потім повторіть."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Порожній шар"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Шар WMS ({0}), {1} квадрат(и,ів) завантажено"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr "Не векторизований."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Розмір растру: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
 msgid "Is vectorized."
 msgstr "Векторизований."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Габаритний прямокутник общини: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -17007,14 +17082,14 @@
 "Створіть новий."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "Помилка формату кешу"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr "Зона Lambert {0} в кеші не сумісна з поточною зоною Lambert {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
 msgid "Cache Lambert Zone Error"
 msgstr "Помилка кешу зони Lambert"
@@ -17093,23 +17168,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Завантажити об’єкт…"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Завантажити дані мапи, що лежать на кінці обраної лінії"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Завантажити зараз"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
 msgstr ""
-"Будь ласка, виберіть 4 або 5 ліній, щоб призначити заборону повороту ліворуч."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -17119,12 +17189,12 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
-#, fuzzy, java-format
+#, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr "Тест {0}/{1}: Виконується {2}"
+msgstr "між {0} {1} та {2} {3}"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Помилка при розборі {0}: {1}"
+msgstr "  додаю {0} {1}"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -17155,9 +17225,9 @@
 msgstr "Створити дублікат лінії"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr "Шар для редагування GPX треків"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Перетворити на GPX шар зі знеособленим часом"
@@ -17167,5 +17237,5 @@
 msgstr "Редагувати Gpx"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr "Редагувати gpx треки"
@@ -17174,11 +17244,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Імпортувати шлях із шару даних GPX"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Очистити існуючий шлях"
@@ -17188,5 +17258,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "Не знайдено шару даних GPX"
@@ -17196,13 +17266,13 @@
 msgstr "Сценарій-нащадок повернув непридатні дані."
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr "Правити інструмент"
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr "Назва:"
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr "Командний рядок:"
@@ -17444,5 +17514,5 @@
 msgstr "Показати фотографії, що не мають координат"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Імпортовані зображення"
@@ -17809,8 +17879,6 @@
 msgstr "Відкрити вікно вимірювань."
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Скинути"
@@ -17842,5 +17910,5 @@
 msgstr "Кут між двома виділеними точками"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Шар для проведення вимірювань"
@@ -17933,5 +18001,5 @@
 msgstr "Цикл завантаження OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Показати проблеми з OpenStreetBugs"
@@ -18003,13 +18071,13 @@
 msgstr "Черга"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr "автономний режим"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr "в мережі"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -18126,95 +18194,95 @@
 msgstr "виконуваний файл Firefox"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
 msgid "Read error!"
 msgstr "Помилка читання!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
 msgid "Write error!"
 msgstr "Помилка запису!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr "Записати координати в заголовок зображення"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 "Записати інформацію про місце знаходження в exif-розділ наступних файлів:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr "налаштування"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr "зберегти резервні копії"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr "зміни час модифікації файлу:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr "на час за gps"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr "на попереднє значення (незмінений mtime)"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr "Втулок геопозначення фотографій"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr "Запис інформації про місце знаходження у файли зображень…"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr "Неможливо прочитати mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr "Неможливо записати mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr "Файл не може бути знищений!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr "Не вдається перейменувати файл!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr "<html><h3>Існують старі резервні файли в каталозі зображень!</h3>"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr "Замінити старі резервні копії?"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr "Зберігайте старі резервні копії і продовжити"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr "Перезаписати"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr "Не вдалося вилучити тимчасовий файл!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr "Тест не пройдено: Неможливо прочитати mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
 msgstr "Тест не пройдено: Не можу записати mtime."
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
-msgstr "Записати координати в заголовок зображення"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
@@ -18255,9 +18323,9 @@
 msgstr "Новий шар зображення з файлу…"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr "Зображення не створено належним чином."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr "Не можливо знайти об’єкт на мапі"
@@ -18435,20 +18503,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "Об’єднана версія"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "підтверджувати всі дії віддаленого управління вручну."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Втулок, що дозволяє іншим програмам керувати JOSM"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Дистанційне керування"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Налаштування втулка віддаленого керування"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18460,35 +18533,37 @@
 "сторонніх застосунків, що підключаються до втулка."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Дозволені дії"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 "Втулок віддаленого керування отримав запит на завантаження даних з API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Деталі запиту: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Дозволити дію?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "Підтвердити дії Віддаленого керування"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr "Втулок віддаленого управління отримав запит на створення нової точки."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -18496,17 +18571,23 @@
 "посилання:"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr "Повністю повернути набір змін"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr "Повернути тільки виділене"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr "Повернути виділені та відновити вилучені об’єкти"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -18514,5 +18595,5 @@
 msgstr "Відмінити набір змін"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Відновити"
@@ -18714,41 +18795,41 @@
 msgstr "Вилучити непотрібні точки з ділянки."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Рухома мапа"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr "Автомасштабування"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Завантажити квадрат мапи"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr "Показати дані квадрату"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Завантажити всі квадрати мапи"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "Збільшити масштаб"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "Зменшити масштаб"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr "Прив’язатися до розміру квадрата"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr "Очистити кеш квадратів мапи"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr "зображення "
@@ -19054,4 +19135,14 @@
 msgid "Terrace"
 msgstr "Ряд будинків по вулиці"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Розділювач"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19826,6 +19917,6 @@
 msgstr "Додати відсутній теґ {0}={1}"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -19838,9 +19929,9 @@
 "якій вона з’єднується з лінією <span class=\"object-name\">{3}</span>."
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr "Розділити зараз"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr "Розділити лінію"
@@ -19923,6 +20014,6 @@
 msgstr "Знайдено {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -19930,5 +20021,5 @@
 msgstr "Помилки"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Перевірка не виявила помилок"
@@ -20172,32 +20263,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Об’єднати дублікати точок?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Подвійні точки"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Подвійні точки"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Об’єднати дублікати точок?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Подвійні точки"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Об’єднати дублікати точок?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -20236,5 +20321,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Мультиполігон"
@@ -20759,5 +20844,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "ділянка"
@@ -20898,10 +20983,10 @@
 msgstr "{0}, …"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr "{0} {1}% трека GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:88
 msgid "Shows current position in the video"
 msgstr "Показати поточне положення у відео-фрагменті"
@@ -21050,10 +21135,10 @@
 "''{0}''"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -21258,9 +21343,5 @@
 "Це може призвести до помилкових координат."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Автоматичне завантаження"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21269,19 +21350,19 @@
 "спотворене"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr "(відключено)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Автоматичне завантаження шару WMS ({0}), в масштабі {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Завантаження шару WMS ({0}), в масштабі {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -21296,17 +21377,17 @@
 "в будь-якому випадку?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr "Так, отримати зображення"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr "Невірний URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Завантажити видимі квадрати мапи"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21315,48 +21396,52 @@
 "змініть розподільчу здатність"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Змінити розподільчу здатність"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Перезавантажити помилкові квадрати"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Альфа-канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Зберегти шар WMS у файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "Зберегти шар WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Завантажити шар WMS з файлу"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "Завантажити шар WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Непідтримувана версія файлу WMS; знайдено {0}, очікувалось {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Помилка формату файлу"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Помилка завантаження файлу"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr "Встановити закладку WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Автоматичне завантаження"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -21435,5 +21520,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -21470,5 +21555,5 @@
 msgstr "Аудіопристрій недоступний"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -21491,5 +21576,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "лісовий масив"
@@ -21502,12 +21587,10 @@
 #. relation type
 #: build/specialmessages.java:17
-#, fuzzy
 msgctxt "Relation type"
 msgid "associatedStreet"
-msgstr "створити зв’язок associatedStreet"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
@@ -21516,19 +21599,16 @@
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Збільшення"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "високовольтна"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
@@ -21537,26 +21617,22 @@
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Мережа"
+msgstr "мережа"
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "громадський транспорт"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Обмеження"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
@@ -21565,5 +21641,4 @@
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
@@ -21572,5 +21647,4 @@
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
@@ -21857,7 +21931,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Завантажити з OSM дані уздовж цього треку"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -22091,6 +22164,11 @@
 msgstr "Зробити ряд будинків по вулиці з одного блоку."
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22102,5 +22180,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22111,5 +22189,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22120,10 +22198,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr "Дозволяє відновлювати об’єкти, вилучені з бази даних OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22134,5 +22212,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22145,5 +22223,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22154,15 +22232,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Просте завантаження уздовж довгого набору взаємопов’язаних шляхів"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Виділити послідовність з’єднаних ліній, що не розгалужуються"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22173,5 +22251,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22306,5 +22384,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Позначення"
@@ -22843,5 +22921,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr "метал"
@@ -22854,5 +22932,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "ліс"
@@ -23156,9 +23234,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "так"
@@ -23268,9 +23346,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "ні"
@@ -23529,5 +23607,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "місцевого значення"
@@ -23576,5 +23654,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "службова"
@@ -23609,5 +23687,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "будується"
@@ -23694,5 +23772,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "пішохідна екскурсія"
@@ -23727,5 +23805,5 @@
 msgstr "добра"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr "середня"
@@ -23895,14 +23973,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Оператор"
@@ -24170,6 +24248,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Висота над рівнем моря"
@@ -24617,5 +24695,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "болото з відкритою водою"
@@ -25021,5 +25099,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Напруга"
@@ -25383,31 +25461,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Години роботи"
@@ -25467,90 +25545,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr "Цілодобово"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Пн-Пт 08:30-20:00"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Вт-Сб 08:00-15:00; Нд 08:00-12:00"
@@ -25663,7 +25741,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Номер"
@@ -25679,5 +25757,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "підземна"
@@ -25690,6 +25768,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Платна"
@@ -25865,5 +25943,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "В інвалідних візках"
@@ -25900,6 +25978,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Навіс"
@@ -25907,5 +25985,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Лавка"
@@ -26024,5 +26102,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Сигнальний вогонь"
@@ -26183,5 +26261,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Кухня"
@@ -26189,73 +26267,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "італійська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "китайська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "піца"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "бутерброди"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "грецька"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "німецька"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "індійська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "місцева"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "кебаб/шашлик"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "турецька"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "азійська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "тайська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "мексиканська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "японська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr "французька"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr "сандвічі"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr "суші"
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Швидке харчування"
@@ -26263,17 +26346,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Властивості Пунктів швидкого харчування"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr "риба і чіпси"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr "курятина"
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Кафе"
@@ -26281,9 +26364,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Властивості Кафе"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Шинок"
@@ -26291,18 +26374,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Властивості Шинка"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Пивний сад"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Властивості Пивного саду"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Бар"
@@ -26310,9 +26394,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Властивості Бару"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Нічний клуб"
@@ -26320,24 +26404,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Властивості Нічного клубу"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Туризм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Атракціони"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Властивості Атракціонів"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Музей"
@@ -26345,9 +26429,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Властивості Музею"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -26356,9 +26440,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:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Властивості Зоопарку"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Оглядовий майданчик"
@@ -26366,24 +26450,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Властивості Оглядового майданчику"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Оглядова вежа"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Парк розваг"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Властивості Парку розваг"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Витвори мистецтв"
@@ -26391,5 +26475,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Властивості Витворів мистецтв"
@@ -26397,19 +26481,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Інформаційне бюро"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Мапа"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr "Тип мапи"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr "топографічна"
@@ -26447,5 +26531,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26453,28 +26537,28 @@
 msgstr "мапа вулиць"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr "план-схема"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr "Територія"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr "місцевість"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "місто"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "область"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "Детальний опис"
@@ -26484,5 +26568,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "Маршрути на мапі:"
@@ -26490,5 +26574,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "піші"
@@ -26496,6 +26580,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Велоспорт"
@@ -26503,5 +26587,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "для гірського велосипеду"
@@ -26509,6 +26593,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Лижі"
@@ -26516,5 +26600,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr "кінні"
@@ -26522,46 +26606,54 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr "…інші можливі способи пересування"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "Інформаційна дошка"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr "Вміст покажчика"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr "повідомлення"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "історична довідка"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "жива природа"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr "рослини"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "Вказівний стовп"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+#, fuzzy
+msgid "Flagpole"
+msgstr "стовп"
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr "Інформаційний термінал"
@@ -26569,29 +26661,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr "Детальний опис"
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr "Аудіогід"
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr "Аудіогід за допомогою мобільного телефону?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "Номер телефону"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "Інші інформаційні пункти"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Властивості Навісу"
@@ -26599,25 +26691,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Вогнище"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Місце для пікніка"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Властивості Місця для пікніка"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Історичні місця"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "За́мок"
@@ -26626,19 +26718,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:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Властивості Замку"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Руїни"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Властивості Руїн"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Археологічні пам’ятки"
@@ -26647,9 +26739,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:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Властивості Археологічних пам’яток"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Поле бою"
@@ -26657,10 +26749,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Властивості Поля бою"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr "Палеонтологічні пам’ятки"
@@ -26668,5 +26760,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr "Властивості Палеонтологічних пам’яток"
@@ -26674,15 +26766,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Монумент"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Властивості Монументу"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Пам’ятник"
@@ -26690,55 +26782,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Властивості Пам’ятнику"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Придорожній Хрест"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Властивості Придорожнього Хреста"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Придорожня Рака"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Властивості Придорожньої Раки"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "Прикордонний камінь"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "Властивості Прикордонного каменя"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Дозвілля"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Властивості Аквапарку"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Ігровий майданчик"
@@ -26746,35 +26838,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Властивості Ігрового майданчику"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Рибалка"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Властивості місця для рибалки"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Спорт"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Спортивні споруди"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Стадіон"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Властивості Стадіону"
@@ -26788,6 +26880,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "види спорту:"
@@ -27203,31 +27295,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858 build/trans_style.java:3866
+#: build/trans_style.java:3874 build/trans_style.java:3882
+#: build/trans_style.java:3890 build/trans_style.java:3898
+#: build/trans_style.java:3906 build/trans_style.java:3914
+#: build/trans_style.java:3922 build/trans_style.java:3930
+#: build/trans_style.java:3938 build/trans_style.java:3946
+#: build/trans_style.java:3954 build/trans_style.java:3962
+#: build/trans_style.java:3970 build/trans_style.java:3978
+#: build/trans_style.java:3986 build/trans_style.java:3994
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098 build/trans_style.java:4106
+#: build/trans_style.java:4114 build/trans_style.java:4122
+#: build/trans_style.java:4130 build/trans_style.java:4138
 msgid "sport"
 msgstr "спорт"
@@ -27237,240 +27329,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "багатоборство"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "стрільба з лука"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr "американський футбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "австралійський футбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "бейсбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "боче (петанк)"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "боулз"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr "канадський футбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "каное"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "скелелазіння"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "тренувальні сітки для крикету"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "собачі перегони"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "кінний спорт"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr "гаельський футбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "гольф"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "гімнастика"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "хокей"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "кінські перегони"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "мотоспорт"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "пелота"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "ракетбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr "ліга регбі"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr "союз регбі"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "стрільба"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "катання на ковзанах"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "катання на лижах"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "плавання"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "настільний теніс"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "теніс"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Спортивний центр"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Властивості Спортивного центру"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Спортивний майданчик"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Властивості Спортивного майданчику"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Бігова доріжка"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Властивості Бігової доріжки"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Поле для гольфу"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Властивості Поля для гольфу"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Міні-гольф"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Властивості Поля для міні-гольфу"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Багатоборство"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Правити Багатоборство"
@@ -27512,23 +27604,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: 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:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 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:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: 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:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 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:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "тип"
@@ -27570,211 +27662,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: 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:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 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:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: 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:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 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:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "спортивний майданчик"
 
-#: 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:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 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:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: 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:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 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:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "спортивний центр"
 
-#: 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:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 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:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: 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:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 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:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "стадіон"
 
-#: 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:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 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:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: 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:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 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:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr "бігова доріжка"
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "Боулінг (10-кегельний)"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "Властивості Боулінгу"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Властивості Атлетики"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Стрільба з лука"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Властивості Стрільби з лука"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Скелелазіння"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Властивості Скелелазіння"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Веслування"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Властивості Каное"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Властивості Велоспорту"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Собачі перегони"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Властивості Собачих перегонів"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Кінний спорт"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "Властивості Кінного спорту"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Кінні перегони"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Властивості Кінських перегонів"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Гімнастика"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Властивості Гімнастики"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Мотоспорт"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Властивості Мотоспорту"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Катання на ковзанах"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Властивості Катання на ковзанах"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Властивості Скейтбордингу"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Плавання"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Властивості Плавання"
@@ -27782,52 +27874,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Властивості Катання на лижах"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Тип лижні"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "гірські лижі"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "бігові лижі"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr "сніговий парк"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Складність"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "початковий рівень"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "легкий рівень"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr "складний рівень"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "для професіоналів"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr "фрірайд"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Стрільба"
@@ -27835,204 +27927,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Властивості Стрільби"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Спорт (з м’ячем)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Властивості Футболу"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Австралійський футбол"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Властивості Австралійського футболу"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr "Американський футбол"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr "Властивості Американського футболу"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr "Канадський футбол"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr "Властивості Канадського футболу"
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr "Гаельський футбол"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr "Властивості Гаельського футболу"
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr "Ліга регбі"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr "Властивості Ліги регбі"
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr "Союз регбі"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr "Властивості Союзу регбі"
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Властивості Бейсболу"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Властивості Бейсболу"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Гольф"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Властивості Гольфу"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "поле для гольфу"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Боче"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Властивості боче"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "Боулз"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "Властивості Боулз"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Властивості Крикету"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Тренувальні сітки для крикету"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Властивості Тренувальних сіток для крикету"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Властивості Крокету"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Хокей"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Властивості Хокею"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Властивості Пелоти"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "Ракетбол"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "Властивості Ракетболу"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Настільний теніс"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Властивості Настільного тенісу"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Теніс"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Властивості Тенісу"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Штучного походження"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Будівля"
@@ -28040,5 +28132,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Громадські будівлі"
@@ -28046,10 +28138,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Властивості Громадської будівлі"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Міська державна адміністрація"
@@ -28057,10 +28149,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Властивості Міської державної адміністрації"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Амбасада"
@@ -28068,10 +28160,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Властивості Амбасади"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Суд"
@@ -28080,10 +28172,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:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Властивості Суду"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "В’язниця"
@@ -28092,10 +28184,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:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Властивості В’язниці"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Поліція/міліція"
@@ -28105,10 +28197,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:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Властивості Поліції/міліції"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Пожежна станція"
@@ -28117,10 +28209,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:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Властивості Пожежного депо"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Пошта"
@@ -28128,5 +28220,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Властивості Пошти"
@@ -28134,15 +28226,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Дитячий садок"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Властивості Дитячого саду"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Школа"
@@ -28150,10 +28242,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Властивості Школи"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Університет"
@@ -28161,10 +28253,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Властивості Університету"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Коледж"
@@ -28172,5 +28264,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Властивості коледжу"
@@ -28178,5 +28270,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Кіно"
@@ -28185,10 +28277,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:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Властивості Кінотеатру"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Бібліотека"
@@ -28197,9 +28289,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:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Властивості Бібліотеки"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Центр мистецтв"
@@ -28207,10 +28299,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Властивості Центру мистецтв"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Театр"
@@ -28219,10 +28311,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:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Властивості Театру"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Культове місце"
@@ -28232,5 +28324,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:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Властивості Культового місця"
@@ -28239,6 +28331,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Релігія"
@@ -28247,66 +28339,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "бахаі"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "буддизм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "християнство"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "індуїзм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "джайнізм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "іудаїзм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "іслам"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "сикхізм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "спіритуалізм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "даосизм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr "уніатство"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "зороастризм"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Віросповідання"
@@ -28315,81 +28407,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "англіканська"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "баптизм"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "католицизм"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "євангелізм"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "свідки ієгови"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "лютеранство"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "методизм"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "мормонство"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "православ’я"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "п’ятидесятники"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "пресвітеріанство"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "протестантизм"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "квакери"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "шиїти"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "суніти"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Адреси"
@@ -28398,5 +28490,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:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Властивості Адреси"
@@ -28404,5 +28496,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Номер будинку"
@@ -28410,25 +28502,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Назва будинку"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Вулиця"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Назва міста"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Поштовий індекс"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Код країни"
@@ -28437,5 +28529,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:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Властивості Вставки адрес"
@@ -28443,61 +28535,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Схема нумерації"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "непарні"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "парні"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "за абеткою"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Штучні об’єкти"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Заводи"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Властивості Заводів"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Башта"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Властивості Башти"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr "Тип Башти"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr "зв’язку"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr "спостереження"
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "Висота (в метрах)"
@@ -28505,25 +28597,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Водонапірна вежа"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Властивості Водонапірної вежі"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Газгольдер"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Властивості Газгольдера"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Маяк"
@@ -28531,10 +28623,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Властивості Маяка"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Вітряк"
@@ -28542,10 +28634,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Властивості Вітряка"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Трубопровід"
@@ -28554,41 +28646,41 @@
 #. <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:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Властивості Трубопроводу"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "газ"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr "тепло"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "нафта"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr "каналізація"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr "іншого призначення"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Розташування"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr "підводне"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr "надземне"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Очисні споруди"
@@ -28598,10 +28690,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:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Властивості Очисних споруд"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Кран"
@@ -28609,5 +28701,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Властивості Крану"
@@ -28615,10 +28707,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Властивості Сигнального вогню"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Геодезичний пункт"
@@ -28626,10 +28718,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Властивості Геодезичного пункту"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Камера спостереження"
@@ -28637,23 +28729,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Властивості Камери спостереження"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr "внутрішня"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr "зовнішня"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr "загальнодоступне"
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Електростанція"
@@ -28663,35 +28755,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:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Властивості Електростанції"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "вітряна"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "гідро"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "теплова"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "атомна"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "вугільна"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "сонячна"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Електропідстанція"
@@ -28700,10 +28792,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:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Властивості Електропідстанції"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Трансформаторна будка"
@@ -28712,5 +28804,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:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Властивості Трансформаторної будки"
@@ -28718,10 +28810,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "назва (номер) мережі"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Опора ЛЕП"
@@ -28732,23 +28824,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:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Властивості Опори ЛЕП"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr "опора"
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr "стовп"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr "Номер опори"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Лінія електропередач"
@@ -28757,22 +28849,20 @@
 #. <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:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Властивості Лінії електропередач"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "Тип лінії"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "високовольтна"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28780,55 +28870,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr "Кількість кабелів"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 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:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "один провід"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "два проводи"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "три проводи"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr "чотири проводи"
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Зручності"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Туалет"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr "обмежений"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Примітка"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Поштова скринька"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Телефон"
@@ -28837,5 +28927,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:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Властивості телефону"
@@ -28843,5 +28933,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Монети"
@@ -28849,5 +28939,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Банкноти"
@@ -28855,5 +28945,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Електронні гаманці та платіжні картки"
@@ -28861,5 +28951,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Дебетові картки"
@@ -28867,15 +28957,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Кредитні картки"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Телефонні картки"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Пункт прийому вторинної сировини"
@@ -28884,5 +28974,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:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Властивості Пункту прийому вторинної сировини"
@@ -28890,35 +28980,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Батарейки/Акумулятори"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Бляшанки"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Одяг/Дрантя"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Скло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Папір"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Металобрухт"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr "Урна для сміття"
@@ -28926,5 +29016,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr "Властивості Урни для сміття"
@@ -28933,31 +29023,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr "Спинка"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Матеріал"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "камінь"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "пластик"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Колір"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "чорний"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "коричневий"
@@ -29036,39 +29126,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "зелений"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "червоний"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "синій"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "сірий"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "білий"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Кількість місць"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Мисливська вежа"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Властивості Мисливської вежі"
@@ -29077,30 +29167,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Висота"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "низька"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "половинна"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "повна"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Прихована"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Зачиняється"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Фонтан"
@@ -29109,10 +29199,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:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Властивості Фонтану"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Питна вода"
@@ -29121,10 +29211,10 @@
 #. <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:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Властивості Питної води"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "Пожежний гідрант"
@@ -29133,5 +29223,5 @@
 #. <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:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "Властивості Пожежного гідранту"
@@ -29139,5 +29229,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Вікно для покинутих немовлят"
@@ -29145,15 +29235,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Властивості Вікна для покинутих немовлят"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Магазини"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "Автомобільний дилер"
@@ -29161,10 +29251,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Властивості Автомобільного дилера"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "Веломагазин"
@@ -29173,28 +29263,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:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Властивості Веломагазина"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Властивості Супермаркету"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr "Побутова хімія"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr "Властивості Магазину побутової хімії"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Міні-маркет"
@@ -29202,9 +29292,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Властивості Міні-маркету"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Кіоск"
@@ -29212,27 +29302,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Властивості Кіоску"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "Книжковий магазин"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Властивості Книжкового магазину"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Турагентство"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Властивості Турагентства"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "М’ясна лавка"
@@ -29240,9 +29330,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Властивості М’ясної лавки"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Булочна"
@@ -29250,9 +29340,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Властивості Булочної"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Квітковий магазин"
@@ -29260,18 +29350,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Властивості Квіткового магазину"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Екологічно чисті продукти"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Властивості Магазину екологічно чистих проуктів"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Алкогольні напої"
@@ -29279,54 +29369,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Властивості Магазину алкогольних напоїв"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Напої"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "Властивості Магазину напоїв"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Комп’ютери"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Властивості Комп’ютерної крамниці"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Електроніка"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Властивості Магазину побутової електроніки"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Аудіо апаратура"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Властивості Магазину Аудіо апаратури"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Меблі"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Властивості Меблевого магазину"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Садово-парковий центр"
@@ -29334,9 +29424,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Властивості Магазину садово-паркових товарів"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Господарські товари"
@@ -29344,9 +29434,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Властивості Магазину господарських товарів"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Зроби сам"
@@ -29354,54 +29444,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Властивості Магазину «Зроби сам»"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Канцтовари"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Властивості Магазину канцтоварів"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Перукарня"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Властивості Перукарні"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Взуття"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Властивості Магазину взуття"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Іграшки"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Властивості Магазину іграшок"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Відео"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Властивості Магазину відео"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Хімчистка"
@@ -29409,9 +29499,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Властивості Хімчистки"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Пральня"
@@ -29419,9 +29509,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Властивості Пральні"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Товари для активного відпочинку"
@@ -29429,24 +29519,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Властивості Магазину товарів для активного відпочинку"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Властивості Магазину спорт-товарів"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Оптика"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Властивості Магазину оптики"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Торговий автомат"
@@ -29454,5 +29544,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Властивості Торгового автомата"
@@ -29460,97 +29550,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Товар"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "квитки на громадський транспорт"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "схеми громадського транспорту"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "талони на паркування"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "продукти харчування"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "напої"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "солодощі"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "сигарети"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "фотографії"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "їжа для тварин"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "газети"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "іграшки"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "марки"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "SIM-карти"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "телефонні картки"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "ваучери"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr "вело шини"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "презервативи"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "тампони"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "пакети для екскрементів"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "накопичувальні, дисконтні карти"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Гроші"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Банк"
@@ -29558,14 +29648,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Властивості Банку"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Обмін валют"
@@ -29573,5 +29663,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Властивості Пункту обміну валют"
@@ -29579,15 +29669,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Властивості Банкомату"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Медицина"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Лікар"
@@ -29595,18 +29685,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Властивості Лікаря"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Стоматологія"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Властивості Стоматології"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -29614,5 +29704,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Властивості Аптеки"
@@ -29620,9 +29710,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "За рецептом"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Лікарня"
@@ -29630,10 +29720,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Властивості Лікарні"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "Пункт швидкої допомоги"
@@ -29642,5 +29732,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:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "Властивості Пункту швидкої допомоги"
@@ -29649,20 +29739,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Номер пункту"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "Назва пункту"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Номер телефону"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Використовуйте міжнародний код, наприклад: +38-044-1030000)"
@@ -29670,5 +29760,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -29677,64 +29767,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:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Властивості Ветеренарного пункту"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Географія"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Місця"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Континент"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Властивості Континенту"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Країна"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Властивості Країни"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Штат"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Властивості Штату"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Область"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Властивості Області"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "Район"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Властивості Району"
@@ -29742,15 +29832,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Місто (понад 100 000)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Властивості Міста"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Місто"
@@ -29758,10 +29848,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Властивості Селища"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Передмістя"
@@ -29769,25 +29859,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Властивості Передмістя"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Село"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Властивості Села"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Хутір"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Властивості Хутора"
@@ -29795,5 +29885,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Місцевість"
@@ -29801,10 +29891,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Властивості Місцевості"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Острів"
@@ -29812,10 +29902,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Властивості Острова"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "Острівець"
@@ -29823,5 +29913,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Властивості Острівця"
@@ -29829,5 +29919,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Вхід до печери"
@@ -29835,10 +29925,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Властивості Входу до печери"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Вершина"
@@ -29846,10 +29936,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Властивості Вершини"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Льодовик"
@@ -29857,10 +29947,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Властивості Льодовика"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Вулкан"
@@ -29868,70 +29958,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Властивості Вулкану"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Кордони"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Державний"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Властивості Державного кордону"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Адміністративний"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Властивості Адміністративного кордону"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Громад"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Властивості Меж громад"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Політичні"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Властивості політичного кордону"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "Національний парк"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Властивості Кордону національного парку"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Землекористування"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Дерево"
@@ -29940,15 +30030,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:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Властивості Дерева"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Ботанічна назва"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Ліс"
@@ -29957,5 +30047,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:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Властивості Лісу"
@@ -29963,17 +30053,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "хвойний"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "листяний"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "мішаний"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Лісовий масив"
@@ -29982,14 +30072,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:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Властивості Лісового масиву"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Заповідник"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Властивості Заповідника"
@@ -29997,25 +30087,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Осип"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Властивості Осипи"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Чагарник"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Властивості Чагарнику"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Кам’яниста земля"
@@ -30023,10 +30113,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Властивості Кам’янистої землі"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Пустир"
@@ -30034,5 +30124,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Властивості Пустиря"
@@ -30040,5 +30130,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Двір ферми"
@@ -30047,45 +30137,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:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Властивості Двору ферми"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Сільськогосподарські угіддя"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Властивості Сільськогосподарських угідь"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Левада"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Властивості Левади"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Виноградник"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Властивості Виноградників"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Горо́д"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Властивості Го́родів"
@@ -30093,25 +30183,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Сад"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Властивості Садів"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Газон"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Властивості Газону"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "Сільський майдан"
@@ -30119,10 +30209,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Властивості Сільського майдану"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Землі місцевої громади"
@@ -30130,20 +30220,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Властивості Земель місцевої громади"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Парк"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Властивості Парку"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Майданчик для ігор"
@@ -30151,5 +30241,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Властивості Майданчику для ігор"
@@ -30157,15 +30247,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Житлова зона"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Властивості Житлової зони"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Цвинтар"
@@ -30173,9 +30263,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Властивості Цвинтаря"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Кладовище"
@@ -30183,39 +30273,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Властивості Кладовища"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Роздрібна торгівля"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Властивості Зони роздрібної торгівлі"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Діловий район"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Властивості Ділового району"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Промзона"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Властивості Промзони"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Територія залізниці"
@@ -30223,15 +30313,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Властивості Території залізниці"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Військова зона"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Властивості Військової зони"
@@ -30239,50 +30329,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Будівельний майданчик"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Властивості Будівельного майданчику"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Очищене місце під забудову"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Властивості Очищеного місця під забудову"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Ділянка під нову забудову"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Властивості Ділянки під нову забудову"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Звалище"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Властивості Звалища"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Кар’єр"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Властивості Кар’єра"
@@ -30292,5 +30382,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:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Властивості Мультиполігону"
@@ -30302,5 +30392,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "зовнішній сегмент"
@@ -30308,5 +30398,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "внутрішній сегмент"
@@ -30314,5 +30404,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr "Кордони"
@@ -30323,5 +30413,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr "Властивості Кордонів"
@@ -30329,36 +30419,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr "Тип Кордону"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr "адміністративний"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr "національний"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr "громади"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr "політичний"
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr "Адміністративний рівень"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr "Підпорядкована територія"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr "Адміністративний центр"
@@ -30366,5 +30456,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Обмеження на поворот"
@@ -30373,5 +30463,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Властивості Обмеження на поворот"
@@ -30379,34 +30469,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Обмеження"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "поворот ліворуч заборонений"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "поворот праворуч заборонений"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "проїзд заборонений"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "розворот заборонений"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "тільки праворуч"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "тільки ліворуч"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "тільки прямо"
@@ -30415,15 +30505,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "з"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "через точку або лінію"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "до"
@@ -30431,5 +30521,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Маршрут"
@@ -30438,5 +30528,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Властивості маршруту"
@@ -30444,5 +30534,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Тип маршруту"
@@ -30550,5 +30640,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -30559,17 +30649,17 @@
 msgstr "велосипедний"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "автобусний"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "дорога"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "поромний"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "лижний"
@@ -30637,5 +30727,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30645,9 +30735,9 @@
 msgstr "піший"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "трамвайний"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "об’їзд"
@@ -30661,10 +30751,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Опис символів"
@@ -30672,31 +30762,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Мережа"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr "Стан маршруту"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "планований"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "альтернативний"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "тимчасовий"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "з’єднуючий"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Колір (hex)"
@@ -30705,30 +30795,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "відрізок маршруту"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "наступний відрізок"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr "попередній відрізок"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "кінцева точка"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "наступна кінцева точка"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "попередня кінцева точка"
@@ -30955,5 +31045,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "застарілий"
@@ -31606,4 +31696,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -31707,11 +31805,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "штучний"
@@ -32224,5 +32322,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "пірс"
@@ -32236,5 +32334,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "трубопровід"
@@ -32378,13 +32476,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902
+#: build/trans_style.java:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "leisure"
 msgstr "розваги"
@@ -32398,5 +32496,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "гавань"
@@ -32492,10 +32590,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "зручності"
@@ -32597,10 +32695,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 build/trans_style.java:2016
+#: build/trans_style.java:2024 build/trans_style.java:2032
+#: build/trans_style.java:2040 build/trans_style.java:2048
+#: build/trans_style.java:2056 build/trans_style.java:2064
+#: build/trans_style.java:2072 build/trans_style.java:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "зручності пересування"
@@ -33038,24 +33136,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: build/trans_style.java:2487 build/trans_style.java:2495
-#: build/trans_style.java:2503 build/trans_style.java:2511
-#: build/trans_style.java:2519 build/trans_style.java:2527
-#: build/trans_style.java:2535 build/trans_style.java:2543
-#: build/trans_style.java:2551 build/trans_style.java:2559
-#: build/trans_style.java:2567 build/trans_style.java:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2352
+#: build/trans_style.java:2360 build/trans_style.java:2368
+#: build/trans_style.java:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 build/trans_style.java:2487
+#: build/trans_style.java:2495 build/trans_style.java:2503
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr "зручності прості"
@@ -33087,6 +33185,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "легка вода"
@@ -33147,8 +33245,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "медицина"
@@ -33501,26 +33599,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 build/trans_style.java:2625
-#: build/trans_style.java:2633 build/trans_style.java:2641
-#: build/trans_style.java:2649 build/trans_style.java:2657
-#: build/trans_style.java:2665 build/trans_style.java:2673
-#: build/trans_style.java:2681 build/trans_style.java:2689
-#: build/trans_style.java:2697 build/trans_style.java:2705
-#: build/trans_style.java:2713 build/trans_style.java:2721
-#: build/trans_style.java:2729 build/trans_style.java:2737
-#: build/trans_style.java:2745 build/trans_style.java:2753
-#: build/trans_style.java:2761 build/trans_style.java:2769
-#: build/trans_style.java:2777 build/trans_style.java:2785
-#: build/trans_style.java:2793 build/trans_style.java:2801
-#: build/trans_style.java:2809 build/trans_style.java:2817
-#: build/trans_style.java:2825 build/trans_style.java:2833
-#: build/trans_style.java:2841 build/trans_style.java:2849
-#: build/trans_style.java:2857 build/trans_style.java:2865
-#: build/trans_style.java:2873 build/trans_style.java:2881
-#: build/trans_style.java:2889 build/trans_style.java:2897
-#: build/trans_style.java:2905 build/trans_style.java:2913
-#: build/trans_style.java:2921 build/trans_style.java:2929
-#: build/trans_style.java:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2721 build/trans_style.java:2729
+#: build/trans_style.java:2737 build/trans_style.java:2745
+#: build/trans_style.java:2753 build/trans_style.java:2761
+#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2785 build/trans_style.java:2793
+#: build/trans_style.java:2801 build/trans_style.java:2809
+#: build/trans_style.java:2817 build/trans_style.java:2825
+#: build/trans_style.java:2833 build/trans_style.java:2841
+#: build/trans_style.java:2849 build/trans_style.java:2857
+#: build/trans_style.java:2865 build/trans_style.java:2873
+#: build/trans_style.java:2881 build/trans_style.java:2889
+#: build/trans_style.java:2897 build/trans_style.java:2905
+#: build/trans_style.java:2913 build/trans_style.java:2921
+#: build/trans_style.java:2929 build/trans_style.java:2937
+#: build/trans_style.java:2946
 msgid "shop"
 msgstr "магазин"
@@ -33592,8 +33690,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 build/trans_style.java:2980
+#: build/trans_style.java:2988 build/trans_style.java:2996
+#: build/trans_style.java:3004 build/trans_style.java:3012
 msgid "hotel"
 msgstr "готель"
@@ -33694,9 +33792,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "туристичний"
@@ -33784,9 +33882,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
+#: build/trans_style.java:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 build/trans_style.java:3141
+#: build/trans_style.java:3149 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
 msgid "historic"
 msgstr "історичний"
@@ -33799,5 +33897,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "кар’єр"
@@ -33811,5 +33909,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "звалище"
@@ -33831,5 +33929,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "водойма"
@@ -33843,5 +33941,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "двір ферми"
@@ -33864,5 +33962,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "роздрібна торгівля"
@@ -33876,5 +33974,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "промисловість"
@@ -33888,5 +33986,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "очищене місце під забудову"
@@ -33900,5 +33998,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "місце під нову забудову"
@@ -33912,5 +34010,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "територія залізниці"
@@ -33967,7 +34065,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "військовий"
@@ -33981,5 +34079,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "кладовище"
@@ -33992,5 +34090,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "гірська вершина"
@@ -34005,5 +34103,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "льодовик"
@@ -34017,5 +34115,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "вулкан"
@@ -34070,8 +34168,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "довкілля"
@@ -34085,5 +34183,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "чагарник"
@@ -34097,5 +34195,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "верес"
@@ -34109,5 +34207,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr "ліс"
@@ -34121,5 +34219,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "грязь"
@@ -34133,5 +34231,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "пляж"
@@ -34209,8 +34307,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "маршрут"
@@ -34299,12 +34397,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "кордон"
@@ -34454,11 +34552,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288
+#: build/trans_style.java:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 build/trans_style.java:4240
+#: build/trans_style.java:4248 build/trans_style.java:4256
+#: build/trans_style.java:4264 build/trans_style.java:4272
+#: build/trans_style.java:4280 build/trans_style.java:4288
+#: build/trans_style.java:4296
 msgid "place"
 msgstr "місцевість"
@@ -34472,5 +34570,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr "дані TIGER"
@@ -34826,9 +34924,21 @@
 msgstr "Італія – Сицилія"
 
-#~ msgid "closedway"
-#~ msgstr "замкнена лінія"
-
-#~ msgid "Target of type {0} with id {1} has invalid version"
-#~ msgstr "Об’єкт типу {0} з ідентифікатором {1} має неправильну версію"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Виділена лінія не містить виділену точку."
+#~ msgstr[1] "Виділена лінія не містить виділених точок"
+#~ msgstr[2] "Виділена лінія не містить всіх виділених точок"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Градуси у Хвилинах Секундах"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr ""
+#~ "Введіть коментар для даних, що надсилаються на сервер (мін. 3 знаки)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Будь ласка, введіть коментар для надсилання на сервер цього набору змін "
+#~ "(мін. 3 символи)"
 
 #~ msgid "Error: {0}"
@@ -35051,4 +35161,7 @@
 #~ msgstr "Встановити значення ідентифікатора в 0"
 
+#~ msgid "closedway"
+#~ msgstr "замкнена лінія"
+
 #~ msgid "Point on angle of building to start drawing"
 #~ msgstr "Вкажіть кут будівлі, щоб почати креслення"
@@ -35106,4 +35219,7 @@
 #~ msgstr "C"
 
+#~ msgid "Target of type {0} with id {1} has invalid version"
+#~ msgstr "Об’єкт типу {0} з ідентифікатором {1} має неправильну версію"
+
 #~ msgid "Create house number and street name relation"
 #~ msgstr "Створити зв’язок номеру будинку з вулицею"