Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 18656)
+++ applications/editors/josm/i18n/po/ru.po	(revision 18773)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-17 17:14+0100\n"
-"PO-Revision-Date: 2009-11-13 20:06+0000\n"
+"POT-Creation-Date: 2009-11-24 10:29+0100\n"
+"PO-Revision-Date: 2009-11-23 19:23+0000\n"
 "Last-Translator: Calibrator <Unknown>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\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: 2009-11-17 16:06+0000\n"
+"X-Launchpad-Export-Date: 2009-11-24 08:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -30,20 +30,20 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Справка"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:431
+#: ../core/src/org/openstreetmap/josm/Main.java:430
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Игнорируется неверная ссылка: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:432
-#: ../core/src/org/openstreetmap/josm/Main.java:452
+#: ../core/src/org/openstreetmap/josm/Main.java:431
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
@@ -64,21 +64,19 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
@@ -86,6 +84,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
@@ -97,12 +95,21 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:451
+#: ../core/src/org/openstreetmap/josm/Main.java:450
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Игнорирование неправильной ссылки на файл: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:463
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:502
+#: ../core/src/org/openstreetmap/josm/Main.java:510
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
+#, java-format
+msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
+msgstr "<html>Не удалось прочитать файл ''{0}''.<br> Ошибка: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:464
@@ -110,17 +117,8 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:503
 #: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
-#, java-format
-msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-msgstr "<html>Не удалось прочитать файл ''{0}''.<br> Ошибка: <br>{1}</html>"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:465
-#: ../core/src/org/openstreetmap/josm/Main.java:473
-#: ../core/src/org/openstreetmap/josm/Main.java:504
-#: ../core/src/org/openstreetmap/josm/Main.java:512
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -128,8 +126,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
@@ -139,21 +137,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -177,8 +175,11 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -191,6 +192,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433
 msgid "Error"
 msgstr "Ошибка"
@@ -211,6 +212,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
@@ -312,5 +313,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
@@ -319,27 +320,27 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
@@ -357,5 +358,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179
 msgid "Cancel"
 msgstr "Отмена"
@@ -367,19 +368,19 @@
 "линию или отношение."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 msgid "Please select the target layer."
 msgstr "Пожалуйста выберите целевой слой."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
 msgid "Select target layer"
 msgstr "Выбор слоя"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465
 msgid "Merge"
 msgstr "Объединить"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
 #, java-format
 msgid ""
@@ -390,5 +391,5 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 msgid "No target layers"
 msgstr "Не выбран слой"
@@ -501,13 +502,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
@@ -606,20 +607,20 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
 #, java-format
 msgid "File: {0}"
 msgstr "Файл: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr "Пакеты правок не открыты"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr "Нет открытых пакетов правок"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
@@ -659,10 +660,10 @@
 "последовательностью точек."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Объединить {0} линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
 msgid "Please select at least two ways to combine."
 msgstr "Выделите не менее двух линий для объединения."
@@ -707,10 +708,10 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
@@ -729,11 +730,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
 msgid "Overwrite"
 msgstr "Перезаписать"
 
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209
 msgid "File exists. Overwrite?"
 msgstr "Файл уже существует. Перезаписать?"
@@ -780,5 +781,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/Command.java:66
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
@@ -787,6 +788,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83
@@ -802,7 +803,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
@@ -830,5 +830,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292
 msgid "Duplicate"
 msgstr "Дублировать"
@@ -852,30 +852,30 @@
 msgstr "Выйти из программы"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235
 msgid "All Formats"
 msgstr "Все форматы"
 
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Экспорт в GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Экспортировать данные в GPX файл"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
 msgid "Nothing to export. Get some data first."
 msgstr "Нет данных для экспорта. Создайте данные."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38
@@ -883,13 +883,13 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75
@@ -908,8 +908,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
@@ -917,7 +917,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235
@@ -940,9 +940,9 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75
@@ -954,5 +954,5 @@
 msgstr "параметр ''{0}'' не должен быть null"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -960,5 +960,5 @@
 msgstr "ожидался экземпляр OsmDataLayer или GpxLayer. Получен ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
 msgid "Export GPX file"
 msgstr "Экспорт GPX-файла"
@@ -1106,6 +1106,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623
 msgid "New"
 msgstr "Создать"
@@ -1243,5 +1243,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
 msgid "Paste"
 msgstr "Вставить"
@@ -1331,11 +1331,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
 msgid "Save"
 msgstr "Сохранить"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Сохранить текущие данные."
@@ -1392,10 +1392,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:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Сохранить как..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Сохранить текущие данные в новый файл."
@@ -1414,10 +1414,10 @@
 "незаконченные объекты."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43
 msgid "Show Status Report"
 msgstr "Показать отчёт о состоянии"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
@@ -1425,20 +1425,20 @@
 "прикрепить к сообщению об ошибке"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42
 #, java-format
 msgid "Help: {0}"
 msgstr "Справка: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
 msgid "Status Report"
 msgstr "Отчёт о состоянии"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
 msgid "Copy to clipboard and close"
 msgstr "Скопировать в буфер и закрыть"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886
@@ -1613,5 +1613,5 @@
 msgstr "Неприкрепленная точка"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1619,5 +1619,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -1664,23 +1664,22 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943
 msgid "Download data"
 msgstr "Скачать данные"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
 msgid "No current dataset found"
 msgstr "Не найден текущий набор данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr "Объект с id {0} не найден в текущем наборе данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
 msgid "Update selection"
-msgstr "Обновить выделенное"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
+msgstr "Обновить выбор"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
@@ -1689,32 +1688,30 @@
 "заново)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96
 msgid "Update Selection"
 msgstr "Обновить выборку"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "There are no selected objects to update."
-msgstr "Не выделены элементы для обновления."
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
+msgstr "Нет выбранных объектов для обновления."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128
 msgid "Selection empty"
 msgstr "Выборка пуста"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154
 msgid "Update objects"
-msgstr "Удалить объекты"
-
+msgstr "Обновить объекты"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
 msgid "Upload data"
 msgstr "Загрузить данные на сервер"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118
 msgid "Upload all changes in the active data layer to the OSM server"
 msgstr "Передать все изменения в активном слое на сервер OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 #, java-format
 msgid ""
@@ -1725,5 +1722,5 @@
 "устранить.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1731,29 +1728,29 @@
 msgstr "Нет изменений для загрузки на сервер."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
 msgid "Nothing to upload. Get some data first."
 msgstr "Нечего загружать. Сначала создайте данные."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr "Синхронизировать только точку {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr "Синхронизировать только линию {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr "Синхронизировать только отношение {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
 msgid "Synchronize entire dataset"
 msgstr "Синхронизировать весь набор данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
 #, java-format
 msgid ""
@@ -1775,11 +1772,11 @@
 "редактирование.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377
 msgid "Conflicts detected"
 msgstr "Обнаружены конфликты"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
 #, java-format
 msgid ""
@@ -1795,5 +1792,5 @@
 "продолжите редактирование.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
 #, java-format
 msgid ""
@@ -1807,22 +1804,22 @@
 "пакет правок.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
 msgid "Changeset closed"
 msgstr "Пакет правок закрыт"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350
 msgid "Prepare conflict resolution"
 msgstr "Подготовить устранение конфликта"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr "Щёлкните, чтобы скачать с сервера все родительские линии для точки {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
 msgid "Click to cancel and to resume editing the map"
 msgstr "Щёлкните, чтобы отменить и подтвердить правку карты"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 #, java-format
 msgid ""
@@ -1838,10 +1835,10 @@
 "устранить в диалоге устранения конфликтов.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 msgid "Node still in use"
 msgstr "Точка ещё используется"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
@@ -1850,9 +1847,9 @@
 "образцу"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523
 msgid "Updating primitive"
 msgstr "Обновление элемента"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1861,5 +1858,5 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611
 #, java-format
 msgid ""
@@ -1870,5 +1867,5 @@
 "снова на сервер, но без этого объекта."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612
 #, java-format
 msgid "Object ''{0}'' is already deleted. Skipping object in upload."
@@ -1877,10 +1874,10 @@
 "сервер."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629
 #, java-format
 msgid "Uploading {0} objects ..."
 msgstr "Передача объектов на сервер. Кол-во: {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -1994,17 +1991,17 @@
 msgstr "Играть медленнее."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49
 msgid "Downloading GPS data"
 msgstr "Скачивание данных GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76
 msgid "Downloaded GPX Data"
 msgstr "Скачанные GPX данные"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Скачивание данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -2014,5 +2011,5 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr "В этом месте нет данных."
@@ -2073,9 +2070,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
 msgid "Errors during Download"
 msgstr "Ошибка во время скачивания"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
 msgid "Errors during download"
 msgstr "Ошибки при скачивании с сервера"
@@ -2095,5 +2092,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
 #, java-format
@@ -2101,5 +2098,5 @@
 msgstr "Режим: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2199,7 +2196,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
-#, fuzzy
 msgid "Move a segment along its normal, then release the mouse button."
-msgstr "Нарисуйте прямоугольник желаемых размеров, и отпустите кнопку мыши."
+msgstr ""
+"Переместите сегмент вдоль его перпендикуляра, затем отпустите кнопку мыши."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
@@ -2208,9 +2205,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
-#, fuzzy
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
 "its normal."
-msgstr "Перемещайте сегмент линии, чтобы образовать прямоугольник"
+msgstr ""
+"Переместите сегмент линии, чтобы создать прямоугольник. Ужерживая Ctrl, "
+"переместите, сегмент вдоль его перпендикуляра."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
@@ -2225,5 +2223,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
@@ -2244,17 +2242,17 @@
 msgstr[2] "Добавьте или переместите новую виртуальную точку на {0} линий"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 msgid "Move elements"
 msgstr "Переместить элементы"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
 msgid "Move them"
 msgstr "Переместить"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
 msgid "Undo move"
 msgstr "Отмена перемещения"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473
 #, java-format
 msgid ""
@@ -2267,13 +2265,13 @@
 "часто производится по ошибке. Действительно переместить их?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 msgid "Always move and don't show dialog again"
 msgstr "Всегда перемещать и больше не показывать этого предупреждения"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2282,9 +2280,9 @@
 "объединения с ближайшей точкой."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
 msgid "Release the mouse button to stop rotating."
 msgstr "Отпустите кнопку мыши, чтобы прекратить вращение."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2295,15 +2293,15 @@
 "выделите что-либо другое"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418
 msgid "Zoom"
 msgstr "Масштаб"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
 msgid "Zoom and move map"
 msgstr "Изменять масштаб и двигать карту"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2313,10 +2311,10 @@
 "карту, нажав правую кнопку мыши, или Ctrl+вверх/вниз/влево/вправо"
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
 msgid "Search..."
 msgstr "Поиск..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search for objects."
@@ -2325,58 +2323,57 @@
 #. -- prepare the combo box with the search expressions
 #.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
 msgid "Please enter a filter string."
 msgstr "Пожалуйста, введите строку фильтра"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
 msgid "Please enter a search string."
 msgstr "Пожалуйста, введите строку для поиска."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "Enter the search expression"
-msgstr "регулярное выражение"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
+msgstr "Введите выражение для поиска"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90
 msgid "replace selection"
 msgstr "заменить выделение"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "add to selection"
 msgstr "добавить к выделению"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
 msgid "remove from selection"
 msgstr "убрать из выделения"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
 msgid "find in selection"
 msgstr "найти в выделенном"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "case sensitive"
 msgstr "регистрозависимый"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid "regular expression"
 msgstr "регулярное выражение"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr "<b>Baker Street</b> - 'Baker' и 'Street' в любом ключе или названии."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr "<b>\"Baker Street\"</b> - 'Baker Street' в любом ключе или названии."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Bak</b> - 'Bak' в любом месте названия."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b> - ключ 'type' с точным значением 'route'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2386,17 +2383,17 @@
 "b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Bak</b> - название не содержит 'Bak'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - key=foot устанавливает в любых значениях."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "<u>Special targets:</u>"
 msgstr "<u>Специальные цели:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2405,17 +2402,17 @@
 "(линия), <b>relation</b>(отношение)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - все объекты, измененные заданным пользователем"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - объект с данным ID (0 для новых объектов)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>точки:</b>... - объект с заданным количеством точек"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2425,21 +2422,21 @@
 "мин-макс)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - все измененные объекты"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - все выделенные объекты"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - все незаконченные объекты"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - все объекты без тегов"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2448,5 +2445,5 @@
 "выражению"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2455,5 +2452,5 @@
 "выражению"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
@@ -2461,5 +2458,5 @@
 "«или»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
@@ -2467,9 +2464,9 @@
 "ключ содержит двоеточие)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Используйте <b>(</b> and <b>)</b> для группировки выражений"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2479,51 +2476,51 @@
 msgstr "Фильтр"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Поиск"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "Submit filter"
 msgstr "Принять фильтр"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "Start Search"
 msgstr "Начать поиск"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Не найдено совпадений для ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Ничего не удалено из выделения в результате поиска ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Ничего не найдено в выделенном, при поиске ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285
 #, java-format
 msgid "Found {0} matches"
 msgstr "Найдено {0} совпадений"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "RX"
 msgstr "RX"
@@ -2540,5 +2537,5 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2546,10 +2543,10 @@
 "использования: ключ=значение"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 msgstr "Ошибка синтаксиса шаблона: Шаблон {0} в {1} недопустим!"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2558,26 +2555,26 @@
 "отношение"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Неожиданный знак: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591
 msgid "Missing arguments for or."
 msgstr "Отсутствуют параметры для \"ИЛИ\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 msgid "Missing argument for not."
 msgstr "Отсутствуют параметры для \"НЕ\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611
 msgid "Expected closing parenthesis."
 msgstr "Отсутствует закрывающая скобка"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673
 msgid "Wrong number of parameters for tags operator."
 msgstr "Неверное количество параметров оператора tags."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675
 #, java-format
 msgid ""
@@ -2588,9 +2585,9 @@
 "выходящее за пределы допустимого диапазона, например: tags:1 или tags:2-5"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Неверное число параметров для оператора точек."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687
 #, java-format
 msgid ""
@@ -2601,5 +2598,5 @@
 "или диапазон, например, точки:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2708,7 +2705,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -2821,5 +2818,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 msgid "Double conflict"
 msgstr "Двойной конфликт"
@@ -2846,5 +2843,5 @@
 msgstr "Невозможно вернуть команду ''{0}'' потому что слоя ''{1}'' больше нет"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2852,6 +2849,6 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78
 msgid "Cannot resolve undecided conflict."
 msgstr "не могу устранить нерешенный конфликт"
@@ -2864,7 +2861,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
-#, fuzzy
 msgid "At least one object to delete required, got empty collection"
-msgstr "По крайней мере, один удаляемый элемент получил пустую коллекцию"
+msgstr ""
+"Требуется удалить, по крайней мере, один объект, получена пустая коллекция"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
@@ -2926,18 +2923,8 @@
 msgstr "Удалить подтверждение"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr "Устранить конфликт при удалении {0}"
-
-#. in case #3892 happens again
-#.
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97
-msgid "null detected in node list"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98
-msgid "unexpected null value for n.getEastNorth(). id of n is"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121
@@ -2973,10 +2960,10 @@
 msgstr "Удаление ссылки из отношения {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57
 #, java-format
 msgid "Resolve conflicts in member list of relation {0}"
 msgstr "Устранить конфликты в списке участников отношения {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89
 msgid ""
 "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
@@ -3010,20 +2997,20 @@
 msgstr "Последовательность"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66
 #, java-format
 msgid "Resolve {0} tag conflicts in node {1}"
 msgstr "Устранить {0} конфликтов тегов в точке {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67
 #, java-format
 msgid "Resolve {0} tag conflicts in way {1}"
 msgstr "Устранить {0} конфликтов тегов в линии {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
 #, java-format
 msgid "Resolve {0} tag conflicts in relation {1}"
 msgstr "Устранить {0} конфликтов тегов в отношении {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
 #, java-format
 msgid "Undelete {0} primitives"
@@ -3045,10 +3032,10 @@
 msgstr "Устранить конфликты версий для отношения {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
 #, java-format
 msgid "Resolve conflicts in node list of way {0}"
 msgstr "Устранить конфликты в списке точек линии {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70
 #, java-format
 msgid "Main dataset does not include node {0}"
@@ -3092,5 +3079,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
 msgid "New value"
 msgstr "Новое значение"
@@ -3137,7 +3124,7 @@
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103
-#, fuzzy, java-format
+#, java-format
 msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-msgstr "требуется параметр ''{0}'' > 0. Получен {1}"
+msgstr "Ожидался параметр ''{0}'' > 0.0, получено {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3146,10 +3133,10 @@
 msgstr "Ошибка: не удается сохранить свойства для ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Ошибка в файле конфигурации на строках {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
 #, java-format
 msgid ""
@@ -3160,5 +3147,5 @@
 "не является каталогом."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405
 #, java-format
 msgid ""
@@ -3169,5 +3156,5 @@
 "является каталогом.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413
 #, java-format
 msgid ""
@@ -3178,5 +3165,5 @@
 "отсутствующий каталог параметров: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416
 #, java-format
 msgid ""
@@ -3187,5 +3174,5 @@
 "каталог параметров: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
 #, java-format
 msgid ""
@@ -3195,5 +3182,5 @@
 "параметрами по умолчанию."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431
 #, java-format
 msgid ""
@@ -3204,5 +3191,5 @@
 "параметров по умолчанию."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439
 #, java-format
 msgid ""
@@ -3213,5 +3200,5 @@
 "параметров к состоянию по умолчанию: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
 #, java-format
 msgid ""
@@ -3222,5 +3209,5 @@
 "резервный<br>{0}<br> а новый будет создан с параметрами по умолчанию.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
 #, java-format
 msgid ""
@@ -3231,10 +3218,10 @@
 "параметров {0} к состоянию по умолчанию."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "Ошибка: Неожиданная строка ''{0}'' в файле закладок ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498
 #, java-format
 msgid ""
@@ -3323,25 +3310,25 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "S"
 msgstr "Ю"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "N"
 msgstr "С"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88
 msgid "W"
 msgstr "З"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "E"
 msgstr "В"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3349,5 +3336,5 @@
 msgstr "Пакет правок {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184
 #, java-format
 msgid ""
@@ -3356,5 +3343,5 @@
 "Невозможно добавить примитив {0} к набору данных, так как он уже присутствует"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629
 #, java-format
 msgid ""
@@ -3367,34 +3354,34 @@
 "критическая ошибка, но необходимо сохраниться, прежде чем продолжить работу."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190
 #, java-format
 msgid "Missing merge target for way with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175
+msgstr "Отстутствует результат слияния для линии с id {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174
 #, java-format
 msgid "Missing merge target for object with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203
-#, fuzzy, java-format
+msgstr "Отстутствует результат слияния для объекта с id {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202
+#, java-format
 msgid "Missing merge target for node with id {0}"
-msgstr "Отсутствуют параметры для \"НЕ\""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
-#, fuzzy, java-format
+msgstr "Отстутствует результат слияния для точки с id {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217
+#, java-format
 msgid "Missing merge target for relation with id {0}"
-msgstr "История для отношения {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224
+msgstr "Отстутствует результат слияния для отношения с id {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
-msgstr ""
+msgstr "Отсутствует результат слияния типа {0} с id {1}"
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254
+#, java-format
 msgid ""
 "Target object with id {0} and version {1} is visible although source object "
@@ -3402,7 +3389,7 @@
 "Keeping target object. "
 msgstr ""
-"Мой элемент с id {0} и версией {1} видимый, хотя чужой элемент с более "
-"низкой версией {2} невидим. Невозможно справиться с этой несовместимостью. "
-"Сохраняю мой элемент. "
+"Полученный объект с id {0} и версией {1} видимый, хотя оригинал с более "
+"низкой версией {2} не видимый. Это несоответствие невозможно. Полученный "
+"объект сохранён. "
 
 #. translators notes must be in front
@@ -3459,34 +3446,37 @@
 msgstr "В"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr "обнаружен id >= 0. Получено {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr "Элемент с id=0 не может быть невидимым"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "обнаружено id > 0. Получено {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "обнаружена версия > 0. Получено {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923
 msgid ""
 "Can''t merge because either of the participating primitives is new and the "
 "other is not"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886
+"Слияние невозможно, потому что, один из участвующих элементов новый, а "
+"другой нет"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925
 #, java-format
 msgid ""
 "Can''t merge primitives with different ids. This id is {0}, the other is {1}"
 msgstr ""
+"Слияние элементов с различными id невозможно. Этот id: {0}, другой же: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37
@@ -3512,13 +3502,14 @@
 "несколькими значениями."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58
+#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59
 msgid "User with the same uid but different name found"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305
+"Найден пользователь с тем же идентификатором пользователя, но с другим именем"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
-msgstr "невозможно добавить узел {0} к незавершённой линии {1}"
+msgstr "невозможно добавить точку {0} к незавершённой линии {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54
@@ -3526,7 +3517,7 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125
-#, fuzzy, java-format
+#, java-format
 msgid "Parameter ''{0}'' > 0 expected, got {1}"
-msgstr "требуется параметр ''{0}'' > 0. Получен {1}"
+msgstr "Ожидался параметр ''{0}'' > 0, получено {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
@@ -3545,7 +3536,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114
-#, fuzzy, java-format
+#, java-format
 msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-msgstr "Невозможно сравнить элемент с id ''{0}'' и элемент с id ''{1}''"
+msgstr "Невозможно сравнить элемент с  ID ''{0}'' и элемент с ID ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
@@ -3686,10 +3677,10 @@
 msgstr "для_текста"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640
 #, java-format
 msgid "Error: {0}"
 msgstr "Ошибка: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640
 #, java-format
 msgid "Warning: {0}"
@@ -3701,6 +3692,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3711,5 +3702,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3720,6 +3711,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3738,6 +3729,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "background"
 msgstr "фон"
@@ -3755,24 +3746,36 @@
 msgstr "Gauss-Laborde Réunion 1947"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117
-msgid ""
-"IMPORTANT : data positioned far away from\n"
-"the current Lambert zone limits.\n"
-"Do not upload any data after this message.\n"
-"Undo your last action, save your work\n"
-"and start a new layer on the new zone."
-msgstr ""
-"ВАЖНО : данные расположены слишком\n"
-"далеко от текущих границ Lambert зоны.\n"
-"Не загружайте пока никаких данных .\n"
-"Отмените последнее действие, сохраните\n"
-"данные и начните новый слой в новой зоне."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133
 msgid "Lambert 4 Zones (France)"
 msgstr "Lambert 4 Zones (Франция)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
+#, java-format
+msgid "{0} ({1} to {2} degrees)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243
+#, java-format
+msgid "{0} (Corsica)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188
+#, fuzzy
+msgid "Lambert CC Zone"
+msgstr "Зона Ламберта"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133
 msgid "Lambert CC9 Zone (France)"
 msgstr "Lambert CC9 Zone (Франция)"
@@ -3786,27 +3789,56 @@
 msgstr "Проекция Меркатора"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62
+msgid "PUWG (Poland)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95
+#, fuzzy
+msgid "PUWG Zone"
+msgstr "Зона UTM"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155
+msgid "PUWG 1992 (Poland)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208
+#, java-format
+msgid "PUWG 2000 Zone {0} (Poland)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
 msgid "Swiss Grid (Switzerland)"
 msgstr "Швейцарская проекция"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387
 msgid "UTM Zone"
 msgstr "Зона UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
-msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25
+#, fuzzy
+msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
-msgid "UTM20N Guadeloupe Ste-Anne 1948"
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26
+#, fuzzy
+msgid "Guadeloupe Ste-Anne 1948"
 msgstr "UTM20N Guadeloupe Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
-msgid "UTM20N Martinique Fort Desaix 1952"
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27
+#, fuzzy
+msgid "Martinique Fort Desaix 1952"
 msgstr "UTM20N Martinique Fort Desaix 1952"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381
+msgid "UTM 20N (France)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393
+msgid "UTM20 North Geodesic system"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
@@ -3821,10 +3853,10 @@
 msgstr "<html>Невозможно записать закладку.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39
 msgid "Do not show again"
 msgstr "Больше не показывать"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3832,32 +3864,32 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
 msgid "incomplete"
 msgstr "неполный"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
 msgid "highway"
 msgstr "дорога"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 #: build/trans_presets.java:3186
 msgid "railway"
 msgstr "железная дорога"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "waterway"
 msgstr "водоём"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "landuse"
 msgstr "землепользование"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3867,5 +3899,5 @@
 msgstr[2] "{0} точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186
 #, java-format
 msgid "{0} member"
@@ -3904,6 +3936,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
 msgid "Conflict"
 msgstr "Конфликт"
@@ -3913,11 +3945,11 @@
 msgstr "Неизвестный хост"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
 msgid "Object deleted"
 msgstr "Объект удалён"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
@@ -4126,11 +4158,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -4245,5 +4277,5 @@
 msgstr "Длина создаваемого сегмента линии"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4253,18 +4285,18 @@
 "<br>Удерживайте CTRL, чтобы выбрать мышкой, напрямую из списка.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(нет объекта)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426
 msgid "User:"
 msgstr "Пользователь:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328
 msgid "Layer not in list."
 msgstr "слоя нет в списке."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4392,50 +4424,50 @@
 msgstr "роль {0} не участвует в паре сравнения {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196
 msgid "Properties"
 msgstr "Параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Теги"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr "Точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
 msgid "Members"
 msgstr "Участники"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 msgid "No pending tag conflicts to be resolved"
 msgstr "Нет конфликтов тегов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Теги ({0} конфликтов)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} неустранённых конфликтов тегов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175
 msgid "Nodes(resolved)"
 msgstr "Точки (без конфликтов)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -4444,17 +4476,17 @@
 "точек этой линии"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179
 msgid "Nodes(with conflicts)"
 msgstr "Точки (с конфликтами)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Pending conflicts in the node list of this way"
 msgstr "Неустранённые конфликты в списке точек этой линии"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184
 msgid "Members(resolved)"
 msgstr "Члены (без конфликтов)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -4464,30 +4496,30 @@
 "конфликтов в списке участников этого отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188
 msgid "Members(with conflicts)"
 msgstr "Участники отношений(с конфликтами)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Неразрешённые конфликты в списке участников этого отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "No pending property conflicts"
 msgstr "Нет актуальных конфликтов свойств"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
 msgid "Properties(with conflicts)"
 msgstr "Свойства (с конфликтами)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Pending property conflicts to be resolved"
 msgstr "Конфликты свойств, ожидающие устранения"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278
 msgid "Conflict Resolution"
 msgstr "Конфликт в разрешении изображения"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373
 #, java-format
 msgid "Parameter current out of range. Got {0}."
@@ -4495,38 +4527,38 @@
 "текущее значение параметра вне допустимой области: текущее значение {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "Список в роли {0} в настоящий момент не учавствует в сравнении пары."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "недопустимое значение параметра \"index\". Текущее значение {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772
 #, java-format
 msgid "Item {0} not found in list."
 msgstr "пункт {0} не найден в списке"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218
 msgid "lock scrolling"
 msgstr "блокировать прокрутку"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226
 msgid "Compare "
 msgstr "Сравнить "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78
 msgid "My version"
 msgstr "Моя версия"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr "Список элементов в моём наборе данных, то есть локальном наборе данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
@@ -4534,5 +4566,5 @@
 msgstr "Объединённая версия"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -4542,30 +4574,30 @@
 "объединении будет принято."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90
 msgid "Their version"
 msgstr "Их версия"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr "Список элементов в их наборе данных, набор данных на сервере"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406
 msgid "> top"
 msgstr "> наверх"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr "Скопировать выделенные точки в начало списка объединённых точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433
 msgid "> bottom"
 msgstr "> вниз"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435
 msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr "Скопировать выделенные элементы в конец списка объединённых элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -4575,5 +4607,5 @@
 "объединённых элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -4583,5 +4615,5 @@
 "списке объединённых элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525
 msgid ""
 "Copy their selected element to the start of the list of merged elements."
@@ -4589,10 +4621,10 @@
 "Скопировать их выделенные элементы в начало списка объединённых элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547
 msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Скопировать их выделенные элементы в конец списка объединённых элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -4602,5 +4634,5 @@
 "списке объединённых элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -4610,54 +4642,54 @@
 "списке объединённых элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "Вверх"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627
 msgid "Move up the selected elements by one position."
 msgstr "Поднять выделенные элементы на одну позицию"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "Вниз"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659
 msgid "Move down the selected entries by one position."
 msgstr "Опустить выделенные элементы на одну позицию"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
 msgstr "Удалить"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691
 msgid "Remove the selected entries from the list of merged elements."
 msgstr "Удалить выделенные записи из списка объединённых элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757
 msgid "Freeze"
 msgstr "Заблокировать"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758
 msgid "Freeze the current list of merged elements."
 msgstr "Заблокировать текущий список объединённых элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753
 msgid "Unfreeze"
 msgstr "Разблокировать"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754
 msgid "Unfreeze the list of merged elements and start merging."
 msgstr "Разблокировать список объединённых элементов и начать объединение"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781
 #, java-format
 msgid ""
@@ -4668,5 +4700,5 @@
 "записей</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786
 #, java-format
 msgid ""
@@ -4677,5 +4709,5 @@
 "записей</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804
 #, java-format
 msgid "My version ({0} entry)"
@@ -4685,5 +4717,5 @@
 msgstr[2] "Моя версия ({0} записей)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -4693,5 +4725,5 @@
 msgstr[2] "Объединённая версия ({0} записей)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810
 #, java-format
 msgid "Their version ({0} entry)"
@@ -4701,6 +4733,6 @@
 msgstr[2] "Их версия ({0} записей)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
-#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79
 #, java-format
 msgid ""
@@ -4711,6 +4743,6 @@
 "синхронизированных регулировках."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
-#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94
 #, java-format
 msgid "Adjustable {0} not registered yet."
@@ -4721,5 +4753,5 @@
 msgstr "Узел"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70
 msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
@@ -4733,5 +4765,5 @@
 msgstr "Неожиданный индекс столбца. Получено {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
 #, java-format
 msgid ""
@@ -4742,19 +4774,19 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423
 msgid "Communication with server failed"
 msgstr "Связь с сервером прервана"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494
 msgid "Yes, undelete them too"
 msgstr "Да, восстановить их тоже"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495
 msgid "No, cancel operation"
 msgstr "Нет, отменить действие"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
 #, java-format
 msgid ""
@@ -4766,9 +4798,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475
 msgid "Undelete additional nodes?"
 msgstr "Восстановить дополнительные точки?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499
 #, java-format
 msgid ""
@@ -4781,5 +4813,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
 msgid "Undelete dependent primitives?"
 msgstr "Восстановить связанные элементы?"
@@ -4805,84 +4837,84 @@
 msgstr "Координаты:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182
 msgid "Deleted State:"
 msgstr "Удалён:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258
 msgid "Visible State:"
 msgstr "Видим:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(отсутствует)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77
 msgid "deleted"
 msgstr "удалён"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354
 msgid "not deleted"
 msgstr "не удалён"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361
 msgid "visible (on the server)"
 msgstr "видим (на сервере)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363
 msgid "not visible (on the server)"
 msgstr "невидим (на сервере)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370
 msgid "Keep a clone of the local version"
 msgstr "Оставить клон локальной версии"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372
 msgid "Physically delete from local dataset"
 msgstr "Физически удалить из локального набора данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471
 msgid "Keep my coordiates"
 msgstr "Оставить мои координаты"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486
 msgid "Keep their coordiates"
 msgstr "Оставить их координаты"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501
 msgid "Undecide conflict between different coordinates"
 msgstr "Восстановить конфликт между различными координатами"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516
 msgid "Keep my deleted state"
 msgstr "Оставить моё состояние \"Удалён\""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531
 msgid "Keep their deleted state"
 msgstr "Оставить их состояние \"Удалён\""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546
 msgid "Undecide conflict between deleted state"
 msgstr "Восстановить конфликт между состояниями \"Удалён\""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561
 msgid "Keep my visible state"
 msgstr "Оставить моё состояние \"Видим\""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576
 msgid "Yes, reset the id"
 msgstr "Да, сбросить id"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207
 msgid "No, abort"
 msgstr "Нет, прервать"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581
 #, java-format
 msgid ""
@@ -4895,17 +4927,17 @@
 "получит новое значение.<br>Вы согласны?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588
 msgid "Reset id to 0"
 msgstr "Сбросить в 0"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602
 msgid "Keep their visible state"
 msgstr "Оставить их состояние \"Видим\""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617
 msgid "Yes, purge it"
 msgstr "Да, очистить"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622
 #, java-format
 msgid ""
@@ -4916,9 +4948,9 @@
 "согласны?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627
 msgid "Remove from dataset"
 msgstr "Удалить из набора данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641
 msgid "Undecide conflict between visible state"
 msgstr "Восстановить конфликт между состояниями \"Видим\""
@@ -4935,19 +4967,19 @@
 "устранения конфликтов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59
 msgid "<undefined>"
 msgstr "<не определено>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
@@ -4963,10 +4995,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -4976,10 +5008,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -5008,27 +5040,27 @@
 msgstr "Их версия (серверный набор данных)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284
 msgid ">"
 msgstr ">"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Оставить выделенные пары ключ/значение из локального набора данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr "Оставить выделенных пары ключ/значение из серверного набора данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378
 msgid "Undecide"
 msgstr "Восстановить конфликт"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Mark the selected tags as undecided"
 msgstr "Пометить выделенные теги, как неулаженные конфликты"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -5053,22 +5085,22 @@
 msgstr "Конфликтов не обнаружено"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
 msgid "Cancel conflict resolution"
 msgstr "Отменить устранение конфликтов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288
 msgid "Apply resolved conflicts"
 msgstr "Применить устранённые конфликты"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096
 msgid "Apply"
 msgstr "Применить"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
@@ -5076,5 +5108,5 @@
 msgstr "ничего"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174
 #: build/trans_presets.java:2301
 msgid "all"
@@ -5167,6 +5199,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5178,5 +5210,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5192,21 +5224,21 @@
 "Позиция {0} за пределами допустимого. Текущее количество участников {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 msgid "Remove this relation member from the relation"
 msgstr "Удалить этого участника из отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 msgid "Keep"
 msgstr "Сохранить"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
 msgid "Keep this relation member for the target object"
 msgstr "Сохранить этого участника отношений для получаемого объекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
 msgid "Undecided"
 msgstr "Нерешённый"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Not decided yet"
 msgstr "Ещё не решено"
@@ -5214,5 +5246,5 @@
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr "Роль:"
@@ -5315,10 +5347,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -5338,13 +5370,13 @@
 msgstr "Стек команд: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
 msgid "Resolve conflicts."
 msgstr "Устранить конфликты."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329
 msgid "Resolve"
 msgstr "Устранить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -5352,5 +5384,5 @@
 "объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106
@@ -5359,25 +5391,25 @@
 msgstr "Выделить на карте объекты, выбранные в списке вверху."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 msgid "Cancel conflict resolution and close the dialog"
 msgstr "Отменить устранение конфликтов и закрыть диалог"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201
 msgid "Apply resolved conflicts and close the dialog"
 msgstr "Применить устранение конфликтов и закрыть диалог"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202
 msgid "Apply Resolution"
 msgstr "Применить устранение конфликтов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214
 msgid "Close anyway"
 msgstr "Закрыть в любом случае"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215
 msgid "Continue resolving"
 msgstr "Продолжить решение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217
 #, java-format
 msgid ""
@@ -5395,13 +5427,13 @@
 "улаживанию конфликтов.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225
 msgid "Conflict not resolved completely"
 msgstr "Конфликт устранён не полностью"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262
 msgid "Resolve conflicts"
 msgstr "Устранить конфликты"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
@@ -5413,8 +5445,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
@@ -5481,5 +5513,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5511,34 +5543,34 @@
 msgstr "Показать список всех загруженных слоёв."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293
 msgid "Delete the selected layer."
 msgstr "Удалить выделенный слой."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363
 msgid "Show/Hide"
 msgstr "Показать/скрыть"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374
 msgid "Toggle visible state of the selected layer."
 msgstr "Показать/скрыть выделенный слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "Включить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416
 msgid "Activate the selected layer"
 msgstr "Активировать выделенный слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471
 msgid "Merge this layer into another layer"
 msgstr "Объединить этот слой с другим слоем"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577
 msgid "Move the selected layer one row up."
 msgstr "Переместить выделенный слой вверх."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596
 msgid "Move the selected layer one row down."
 msgstr "Переместить выделенный слой вниз."
@@ -5548,19 +5580,18 @@
 msgstr "Информация о слое"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
+#, java-format
 msgid "This will change {0} object."
 msgid_plural "This will change up to {0} objects."
-msgstr[0] "Количество изменяемых объектов: {0}"
-msgstr[1] "Это изменит до {0} объектов."
-msgstr[2] "Это изменит до {0} объектов."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
-#, fuzzy
+msgstr[0] "Это изменить {0} объект."
+msgstr[1] "Это изменит {0} объекта."
+msgstr[2] "Это изменит {0} объектов."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
 msgid "An empty value deletes the tag."
 msgstr "Пустое значение удаляет тег."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
@@ -5569,10 +5600,10 @@
 msgstr "<различные>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
 msgid "Change values?"
 msgstr "Изменить значения?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5582,5 +5613,5 @@
 msgstr[2] "Изменить параметры {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328
 #, java-format
 msgid "This will change up to {0} object."
@@ -5590,9 +5621,9 @@
 msgstr[2] "Это изменит до {0} объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 msgid "Please select a key"
 msgstr "Пожалуйста, выберите ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340
 msgid "Please select a value"
 msgstr "Выберите значение"
@@ -5616,102 +5647,98 @@
 msgstr "Член группы"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569
 msgid "Add Properties"
 msgstr "Добавить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Свойств: {0} / Участников: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794
+msgid "Properties / Memberships"
+msgstr "Параметры / Участники"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836
+msgid "Change relation"
+msgstr "Изменить отношение"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837
+msgid "Delete from relation"
+msgstr "Удалить из отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Вы действительно хотите удалить отмеченное из отношения {0}?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857
+msgid "Delete the selected key in all objects"
+msgstr "Удалить выделенный ключ из всех объектов"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
+msgid "Delete Properties"
+msgstr "Удалить параметры"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавить новую пару ключ/значение для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
-msgid "Edit Properties"
-msgstr "Изменить параметры"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902
 msgid "Edit the value of the selected key for all objects"
 msgstr "Изменить значение выбранного ключа для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Свойств: {0} / Участников: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
-msgid "Properties / Memberships"
-msgstr "Параметры / Участники"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
-msgid "Change relation"
-msgstr "Изменить отношение"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
-msgid "Delete from relation"
-msgstr "Удалить из отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Вы действительно хотите удалить отмеченное из отношения {0}?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
-msgid "Delete the selected key in all objects"
-msgstr "Удалить выделенный ключ из всех объектов"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
-msgid "Delete Properties"
-msgstr "Удалить параметры"
-
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177
 #: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 msgid "Open a list of all relations."
 msgstr "Показать список всех отношений."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175
 #, java-format
 msgid "Relations: {0}"
 msgstr "Отношения: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269
 msgid "Open an editor for the selected relation"
 msgstr "Открыть редактор для выбранного отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310
 msgid "Delete the selected relation"
 msgstr "Удалить выбранное отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348
 msgid "Create a new relation"
 msgstr "Создать новое отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Создать копию этого отношения и открыть его в другом окне редактора"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423
 msgid "Set the current selection to the list of selected relations"
 msgstr "Установить текущий выбор на списке выделенных отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450
 msgid "Select the members of all selected relations"
 msgstr "Выделите участников всех выбранных отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452
 msgid "Select members"
 msgstr "Выбрать участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482
 msgid "Download all members of the selected relations"
 msgstr "Скачать с сервера всех участников выделенных отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483
 msgid "Download members"
 msgstr "Скачать участников"
@@ -5740,5 +5767,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5750,9 +5777,9 @@
 msgstr "Выбор: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334
 msgid "Undock the panel"
 msgstr "Отсоединить панель"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5761,5 +5788,5 @@
 "панели."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359
 msgid "Click to minimize/maximize the panel content"
 msgstr "Щёлкните для уменьшения/увеличения содержимого панели"
@@ -5847,12 +5874,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390
 msgid "Download relation members"
 msgstr "Скачать участников отношений"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
 msgid "Conflicts in data"
 msgstr "Конфликт в данных"
@@ -5871,5 +5898,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518
 #, java-format
 msgid "Downloading relation {0}"
@@ -5877,5 +5904,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476
 #, java-format
@@ -5885,18 +5912,18 @@
 "Исключение: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
 msgid "Tags and Members"
 msgstr "Теги и участники"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
 msgid "Parent Relations"
 msgstr "Родительские отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Child Relations"
 msgstr "Дочерние элементы отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5908,14 +5935,14 @@
 "хотите продолжать с циклическими отношениями?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr "Удалить их, почистить отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr "Игнорировать их, оставить отношение как есть"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5928,9 +5955,9 @@
 "участника отношения?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr "Несколько участников, относящихся к одному и тому же элементу"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5943,5 +5970,5 @@
 "''{0}'' будет пропущено.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5950,5 +5977,5 @@
 "участником"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5957,5 +5984,5 @@
 "участника"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5965,5 +5992,5 @@
 "выделенным участником"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5973,20 +6000,20 @@
 "выделенного участника"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801
 msgid "Remove all members referring to one of the selected primitives"
 msgstr "Удалить всех участников, относящихся к каждому из выделенных элементов"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804
 msgid "Relation Editor: Remove Selected"
 msgstr "Редактор отношений: удалить выделенное"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr "Выделить участников отношения, которые относятся к выбранным элементам"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848
 #, java-format
 msgid ""
@@ -5997,61 +6024,61 @@
 "выделенных элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
 msgid "Select primitives for selected relation members"
 msgstr "Выделить элементы для выделенных участников отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892
 msgid "Sort the relation members"
 msgstr "Сортировать участников отношений"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
 msgid "Relation Editor: Sort"
 msgstr "Редактор отношений: сортировать"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
 msgid "Move the currently selected members up"
 msgstr "Переместить выделенных участников отношения вверх"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
 msgid "Relation Editor: Move Up"
 msgstr "Редактор отношений: поднять"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
 msgid "Move the currently selected members down"
 msgstr "Переместить выделенных участников отношения вниз"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
 msgid "Relation Editor: Move Down"
 msgstr "Редактор отношений: опустить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945
 msgid "Remove the currently selected members from this relation"
 msgstr "Удалить отмеченных участников из отношения"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
 msgid "Relation Editor: Remove"
 msgstr "Редактор отношений: удалить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
 msgid "Delete the currently edited relation"
 msgstr "Удалить редактируемое отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048
 msgid "Yes, create a conflict and close"
 msgstr "Да, создать конфликт и закрыть"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "Click to create a conflict and close this relation editor"
 msgstr "Щёлкните, чтобы создать конфликт и закрыть этот редактор отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "No, continue editing"
 msgstr "Нет, продолжить редактирование"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
@@ -6060,5 +6087,5 @@
 "отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -6070,9 +6097,9 @@
 "создать конфликт и закрыть редактор?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 msgid "Conflict in data"
 msgstr "Конфликт в данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080
 #, java-format
 msgid ""
@@ -6083,41 +6110,41 @@
 "<br>Пожалуйста, устраните этот конфликт, прежде чем продолжать.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094
 msgid "Apply the current updates"
 msgstr "Записать внесённые изменения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127
 msgid "Apply the updates and close the dialog"
 msgstr "Применить обновления и закрыть диалог"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161
 msgid "Cancel the updates and close the dialog"
 msgstr "Отменить обновления и закрыть диалог"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178
 msgid "Add an empty tag"
 msgstr "Добавить пустой тег"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Скачать недостающие части линий и точки, участвующие в отношении"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193
 msgid "Download Members"
 msgstr "Скачать участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
 msgid "Relation Editor: Download Members"
 msgstr "Редактор отношений: скачать участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217
 msgid "Sets a role for the selected members"
 msgstr "Задать роль для выделенных участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220
 msgid "Apply Role"
 msgstr "Применить роль"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233
 #, java-format
 msgid ""
@@ -6130,19 +6157,26 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237
 msgid "Yes, apply it"
 msgstr "Да, записать"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238
 msgid "No, don't apply"
 msgstr "Нет, не записывать"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "Confirm empty role"
 msgstr "Подтвердить пустую роль"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Выделенный, при редактировании отношения, участник относится к"
+
+#. download the relation
+#.
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427
+#, fuzzy, java-format
+msgid "Downloading relation ''{0}''"
+msgstr "Скачивание отношения {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190
@@ -6152,8 +6186,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
-#, fuzzy
 msgid "Zoom to the object the first selected member refers to"
-msgstr ""
-"Приблизиться к элементу, к которому относится первый выделенный участник"
+msgstr "Масштабирование приближает к первому выбранному объекту"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211
@@ -6165,11 +6197,7 @@
 msgstr "Масштабирование отменено, потому что вы не выбрали участника"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25
 msgid "Refers to"
 msgstr "Ссылается на"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32
-msgid "Linked"
-msgstr "Связанные"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
@@ -6182,5 +6210,5 @@
 msgstr "Ожидалось значение child.getId() > 0. Получено {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -6255,10 +6283,10 @@
 msgstr "Закладки"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 "<html>В настоящий момент не выбрана область для скачивания с сервера.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
 #, java-format
 msgid ""
@@ -6269,13 +6297,13 @@
 "minlon, maxlat, maxlon): {0}, {1}, {2}, {3}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
 msgid "Create bookmark"
 msgstr "Создать закладку"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
 msgid "Add a bookmark for the currently selected download area"
 msgstr "Добавить закладку к области,  выделенной в настоящий момент"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
@@ -6284,40 +6312,40 @@
 "её."
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250
+msgid "Please enter a name for the bookmarked download area."
+msgstr ""
+"Пожалуйста, введите название закладки для скачиваемой с сервера области."
+
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
-msgid "Please enter a name for the bookmarked download area."
-msgstr ""
-"Пожалуйста, введите название закладки для скачиваемой с сервера области."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr "Название места"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212
 msgid "Remove the currently selected bookmarks"
 msgstr "Удалить выделенные закладки"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238
 msgid "Rename the currently selected bookmark"
 msgstr "Переименовать выделенные закладки"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "min lat"
 msgstr "мин. широта"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "min lon"
 msgstr "мин. долгота"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
 msgid "max lat"
 msgstr "макс. широта"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "max lon"
 msgstr "макс. долгота"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -6327,52 +6355,52 @@
 "область)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
 msgid "Bounding Box"
 msgstr "Рамка"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
 #, java-format
 msgid "The string ''{0}'' isn''t a valid double value."
 msgstr "Строка ''{0}'' не является правильным двойным значением."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
 msgid "Value for latitude in range [-90,90] required."
 msgstr "Значение широты должно быть в пределах [-90,90]."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Значение долготы должно быть в пределах  [-180,180]."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste URL from clipboard"
 msgstr "Вставьте ссылку из буфера"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88
 msgid "Data Sources and Types"
 msgstr "Источники и типы данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "OpenStreetMap data"
 msgstr "Данные OpenStreetMap"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
 msgid "Select to download OSM data in the selected download area."
 msgstr "Пометьте, чтобы скачать с сервера данные OSM, для выделенной области."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92
 msgid "Raw GPS data"
 msgstr "Данные GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Пометьте, чтобы скачать с сервера треки GPS, для выделеной области."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113
 msgid "Download as new layer"
 msgstr "Скачать как новый слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
@@ -6382,18 +6410,18 @@
 "пометку, чтобы скачать данные с сервера в текущий активный слой.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118
 msgid "Download Area"
 msgstr "Область для скачивания"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380
 msgid "Download"
 msgstr "Скачать"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206
 msgid "No area selected yet"
 msgstr "Область ещё не выбрана"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
@@ -6401,21 +6429,21 @@
 "запрос."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Область для скачивания приемлема по площади."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 msgid "Click to close the dialog and to abort downloading"
 msgstr "Нажмите, чтобы закрыть диалог и прервать скачивание с сервера"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
 msgid "Click do download the currently selected area"
 msgstr "Нажмите, чтобы скачать с сервера выделенную область"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389
 msgid "Please select a download area first."
 msgstr "Пожалуйста, выделите сначала область для скачивания с сервера."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398
 #, java-format
 msgid ""
@@ -6440,21 +6468,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Пустой указатель исключение, возможно есть отсутствующие теги"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255
 msgid "Search ..."
 msgstr "Найти ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257
 msgid "Click to start searching for places"
 msgstr "Нажмите, чтобы начать поиск мест"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296
 msgid "Querying name server"
 msgstr "Запрос на сервер имён"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324
 msgid "Querying name server ..."
 msgstr "Запрос на сервер имён ..."
@@ -7193,8 +7221,8 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7367,5 +7395,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402
 #: build/trans_presets.java:361 build/trans_presets.java:660
 #: build/trans_presets.java:800 build/trans_presets.java:1148
@@ -7377,5 +7405,5 @@
 msgstr "Тип"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410
 msgid "Near"
 msgstr "Возле"
@@ -7426,5 +7454,5 @@
 msgstr "Браузер справки JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188
 #, java-format
 msgid ""
@@ -7445,5 +7473,5 @@
 "статью <a href=\"{3}\">help на английском языке</a>.</p></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210
 #, java-format
 msgid ""
@@ -7458,5 +7486,5 @@
 "<br><tt>{1}</tt></p></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312
 #, java-format
 msgid ""
@@ -7467,19 +7495,19 @@
 "сети проблемы, поэтому проверьте<br>ваше интернет-соединение</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317
 msgid "Failed to open URL"
 msgstr "Не удалось открыть ссылку"
 
 #. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350
 msgid "Open the current help page in an external browser"
 msgstr "Открыть текущую страницу справки во внешнем браузере"
 
 #. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362
 msgid "Edit the current help page"
 msgstr "Править текущую страницу справки"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369
 #, java-format
 msgid ""
@@ -7491,33 +7519,33 @@
 
 #. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392
 msgid "Reload the current help page"
 msgstr "Загрузить заново текущую страницу справки"
 
 #. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407
 msgid "Go to the previous page"
 msgstr "Перейти на предыдущую страницу"
 
 #. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427
 msgid "Go to the next page"
 msgstr "Перейти на следующую страницу"
 
 #. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443
 msgid "Go to the JOSM help home page"
 msgstr "Перейти на начальную страницу справки JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474
 msgid "Warning: bad location in HTML document. Exception was: "
 msgstr ""
 "Предупреждение: плохое расположение в документе HTML. Исключение было: "
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
 msgid "Failed to open help page. The target URL is empty."
 msgstr "Не удалось открыть справочную страницу. Ссылка пуста."
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525
 msgid "Failed to open help page"
 msgstr "Не удалось открыть справочную страницу"
@@ -7540,5 +7568,5 @@
 msgstr "Долгота: "
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136
 msgid "Coordinates"
 msgstr "Координаты"
@@ -7604,12 +7632,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65
-#, fuzzy, java-format
+#, java-format
 msgid "Parameter ''{0}'' > 0 expected. Got {1}."
-msgstr "требуется параметр ''{0}'' > 0. Получен {1}"
+msgstr "Ожидался параметр ''{0}'' > 0. Получено {1}."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
-#, fuzzy, java-format
+#, java-format
 msgid "id in parameter ''{0}'' > 0 expected, got {1}."
-msgstr "требуется параметр id ''{0}'' > 0. Получен {1}"
+msgstr "ожидался id in parameter ''{0}'' > 0, получено {1}."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128
@@ -7634,33 +7662,31 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77
 #, java-format
 msgid "Node {0}"
 msgstr "Точка {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195
+msgid "Zoom to node"
+msgstr "Приблизиться к точке"
+
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
-#, fuzzy
-msgid "Zoom to node"
-msgstr "Приблизиться к проблеме"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197
 msgid "Zoom to this node in the current data layer"
-msgstr ""
+msgstr "Приблизиться к этой точке в текущем слое"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241
+msgid "Show history"
+msgstr "Показать историю"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242
-#, fuzzy
-msgid "Show history"
-msgstr "Загрузить историю"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243
 msgid "Open a history browser with the history of this node"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+msgstr "Открыть историю этой точки с помощью браузера"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78
 #, java-format
 msgid "Way {0}"
 msgstr "Линия {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
 #, java-format
 msgid "Relation {0}"
@@ -7669,7 +7695,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60
-#, fuzzy
 msgid "not present"
-msgstr "Сортировать меню заготовок"
+msgstr "не существует"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
@@ -7687,7 +7712,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -7715,21 +7739,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
 msgstr ""
+"<html>Версия <strong>{0}</strong> в настоящий момент отредактирована в слое "
+"''{1}''</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
+msgstr ""
 "<html>Версия <strong>{0}</strong> Создано на <strong>{1}</strong></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
-msgstr ""
-"<html>Версия <strong>{0}</strong> Создано на <strong>{1}</strong></html>"
-
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
-#, fuzzy
 msgid "anonymous"
-msgstr "<анонимный>"
+msgstr "анонимный"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7757,17 +7781,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
-#, fuzzy, java-format
+#, java-format
 msgid "Version {0} in editor"
-msgstr "Версия {0}"
+msgstr "Версия {0} в редакторе"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
-#, fuzzy
 msgid "[deleted]"
-msgstr "удалён"
+msgstr "[удалено]"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Version {0} currently edited in data layer ''{1}''"
-msgstr "Версия {0} дата создания: {1} автор: {2}"
+msgstr "Версия {0} в настоящий момент отредактирована в слое данных ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20
@@ -7821,10 +7844,10 @@
 msgstr "Закрытие пакета правок {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926
 msgid "Launch a file chooser to select a file"
 msgstr "Открыть диалог выбора файла"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148
+#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146
 msgid "Select filename"
 msgstr "Выберите имя файла"
@@ -8075,5 +8098,5 @@
 #. item "Water/Water/River" text "Name"
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
 #: build/trans_presets.java:79 build/trans_presets.java:96
 #: build/trans_presets.java:115 build/trans_presets.java:134
@@ -8096,17 +8119,17 @@
 msgstr "Слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28
 msgid "Should upload?"
 msgstr "Следует загрузить на сервер?"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36
 msgid "Should save?"
 msgstr "Следует сохранить?"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44
 msgid "Filename"
 msgstr "Имя файла"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203
 msgid "Upload"
@@ -8123,7 +8146,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969
 msgid "Tags of new changeset"
 msgstr "Теги нового пакета правок"
@@ -8169,13 +8192,13 @@
 msgstr[2] "Удалить {0} объектов:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483
 msgid "Upload Changes"
 msgstr "Загрузить изменения на сервер"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485
 msgid "Upload the changed primitives"
 msgstr "Загрузить на сервер изменённые элементы"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491
 msgid "Please enter a comment for this upload changeset (min. 3 characters)"
 msgstr ""
@@ -8183,17 +8206,17 @@
 "(мин. 3 символа)"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Illegal upload comment"
 msgstr "неверный комментарий загрузки на сервер"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518
 msgid "Cancel the upload and resume editing"
 msgstr "Отменить загрузку на сервер и продолжить редактирование"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624
 msgid "Upload all changes in one request"
 msgstr "Загрузить все изменения на сервер одним запросом"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625
 msgid ""
 "Enable to upload all changes in one request, disable to use one request per "
@@ -8203,40 +8226,40 @@
 "отключите, чтобы делать отдельный запрос для каждого изменённого элемента"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Прокомментируйте данные, загружаемые на сервер:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637
 msgid "Enter an upload comment (min. 3 characters)"
 msgstr "Введите комментарий для загрузки на сервер (мин. 3 символа)"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695
 msgid "Open a new changeset"
 msgstr "Открыть новый пакет правок"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696
 msgid "Open a new changeset and use it in the next upload"
 msgstr ""
 "Открыть новый пакет правок и использовать его в следующей загрузке на сервер"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703
 msgid "Use an open changeset"
 msgstr "Использовать открытый пакет правок"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704
 msgid "Upload data to an already opened changeset"
 msgstr "Загрузить данные на сервер в уже открытый пакет правок"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744
 msgid "Close changeset after upload"
 msgstr "Закрыть пакет правок после загрузки на сервер"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745
 msgid "Select to close the changeset after the next upload"
 msgstr ""
 "Выбрать, какой пакет правок надо закрыть, после следующей загрузки на сервер"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981
 #, java-format
 msgid "Tags of changeset {0}"
@@ -8244,16 +8267,16 @@
 
 #. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000
 msgid "Load the list of your open changesets from the server"
 msgstr "Загрузите с сервера список открытых вами пакетов правок"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014
 msgid "Close the currently selected open changeset"
 msgstr "Закрыть открытый пакет правок, выбранный в настоящий момент"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -8303,24 +8326,24 @@
 msgstr "Продолжить загрузку на сервер"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
 #, java-format
 msgid "Images for {0}"
 msgstr "Изображения для {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
 msgid "Read GPX..."
 msgstr "Прочесть GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Нет указания времени для точки {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Невозможно прочесть время \"{0}\" у точки  {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147
 #, java-format
@@ -8328,33 +8351,33 @@
 msgstr "Чтение {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354
 msgid "No images with readable timestamps found."
 msgstr "Не найдено изображений с информацией о времени."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276
 msgid "Geotagged Images"
 msgstr "Изображения с данными о местоположении"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598
 #, java-format
 msgid "GPS start: {0}"
 msgstr "Начало GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599
 #, java-format
 msgid "GPS end: {0}"
 msgstr "Конец GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "current delta: {0}s"
 msgstr "текущая разница: {0} с."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 msgid "timezone difference: "
 msgstr "разница в часовых поясах: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 msgid "image"
@@ -8364,14 +8387,14 @@
 msgstr[2] "изображений"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} в пределах трека"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
 msgid "Sync clock"
 msgstr "Синхронизация часов"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
@@ -8379,32 +8402,32 @@
 msgstr "Изображения JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Невозможно прочесть дату из файла \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "EXIF файла \"{0}\" не содержит информации о времени."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761
 msgid "Image"
 msgstr "Изображение"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "GPS unit timezone (difference to photo)"
 msgstr "Часовой пояс GPS объекта (отличается от фотографии)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778
 msgid "Synchronize Time with GPS Unit"
 msgstr "Синхронизировать время с GPS приёмником"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808
 msgid "Time entered could not be parsed."
 msgstr "Введённое время невозможно использовать"
@@ -8494,5 +8517,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Description: {0}"
@@ -8547,10 +8570,10 @@
 msgstr[2] "{0} путевых точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
 msgid "Convert to data layer"
 msgstr "Преобразовать в слой данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -8560,11 +8583,11 @@
 "считается вредоносной.<br>Если хотите загрузить треки, ознакомьтесь с этим:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
@@ -8574,29 +8597,29 @@
 msgstr "Преобразовано из: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931
 msgid "Download from OSM along this track"
 msgstr "Скачать с OSM данные вдоль этого трека"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815
 msgid "Download everything within:"
 msgstr "Скачать всё в пределах:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #, java-format
 msgid "{0} meters"
 msgstr "{0} метров"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 msgid "Maximum area per request:"
 msgstr "Максимальная область для одного запроса:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924
 #, java-format
 msgid ""
@@ -8607,9 +8630,9 @@
 "Продолжить?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035
 msgid "No GPX track available in layer to associate audio with."
 msgstr "На слое отсутствует трек GPX, чтобы наложить звук."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -8619,5 +8642,5 @@
 "будут пропущены или перенесены в начало трека."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -8627,24 +8650,24 @@
 "проигнорированы при рассчете времени."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Слой данных {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
 msgid "outside downloaded area"
 msgstr "вне области для скачивания"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
 #, java-format
 msgid "version {0}"
 msgstr "версия {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
 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:331
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
 #, java-format
 msgid "There was {0} conflict detected."
@@ -8654,5 +8677,5 @@
 msgstr[2] "Обнаружено {0} конфликтов."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
 #, java-format
 msgid ""
@@ -8676,5 +8699,5 @@
 "удалёны на сервере."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
 #, java-format
 msgid ""
@@ -8694,11 +8717,11 @@
 "конфликтов и устраните конфликты вручную."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 msgid "Click to close this dialog and continue editing"
 msgstr "Нажмите, чтобы закрыть этот диалог и продолжить правку"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -8708,22 +8731,35 @@
 msgstr[2] "{0} удалено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} состоит из:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr "отключено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "Версия API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
 msgid "Convert to GPX layer"
 msgstr "Преобразовать в слой GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
+msgid "Dataset consistency test"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730
+#, fuzzy
+msgid "No problems found"
+msgstr "Не найдена линия \"от\""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733
+msgid "Following problems found:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
@@ -8832,9 +8868,9 @@
 msgstr "Нет существующих аудио маркеров на этом слое"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Показать/скрыть текст/значки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Показать/скрыть текст и значки маркеров."
@@ -8900,5 +8936,5 @@
 msgstr "Значение по умолчанию неизвестно (настройка ещё не использовалась)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660
@@ -8906,5 +8942,5 @@
 msgstr "Пожалуйста, выберите ряд для редактирования."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
 #, java-format
@@ -8912,5 +8948,5 @@
 msgstr "Новое значение для {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
@@ -8919,5 +8955,5 @@
 msgstr "Пожалуйста, выберите ряд для удаления."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268
 msgid "Enter a new key/value pair"
 msgstr "Введите новый ключ и значение"
@@ -9057,40 +9093,40 @@
 msgstr "Калибровка звукозаписи"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 msgid "Color"
 msgstr "Цвет"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Стиль рисования {0}:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Слой: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Выбрать"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Выберите цвет для {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
 msgid "Set to default"
 msgstr "Установить значение по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
 msgid "Set all to default"
 msgstr "Установить все значения по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
 msgid "Colors used by different objects in JOSM."
 msgstr "Цвета, используемые разными объектами в JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
 msgid "Colors"
 msgstr "Цвета"
@@ -9539,17 +9575,17 @@
 msgstr "Необходимо перезапустить JOSM, чтобы изменения вступили в силу."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79
 msgid "Display coordinates as"
 msgstr "Отображать координаты как"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82
 msgid "Projection method"
 msgstr "Тип проекции"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85
 msgid "Projection code"
 msgstr "Код проекции"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr "Границы"
@@ -9559,5 +9595,5 @@
 msgstr "Картографическая проекция"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -9615,81 +9651,81 @@
 msgstr "Горячая клвиша"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155
 msgid "Active styles"
 msgstr "Активные стили"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165
 #, java-format
 msgid "Available styles (from {0})"
 msgstr "Доступные стили (из {0})"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171
 msgid "Icon paths"
 msgstr "Пути к иконкам"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407
 #, java-format
 msgid "Short Description: {0}"
 msgstr "Краткое описание: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409
 #, java-format
 msgid "Author: {0}"
 msgstr "Автор: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Webpage: {0}"
 msgstr "Веб-страница: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Version: {0}"
 msgstr "Версия: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432
 msgid "Add a filename or an URL of an active style"
 msgstr "Добавить название файла или ссылку на активные стили"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 msgid "Remove the selected styles from the list of active styles"
 msgstr "Удалить выбранные стили из списка активных стилей"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468
 msgid "Edit the filename or URL for the selected active style"
 msgstr "Заменить имя файла или ссылку для выбранного активного стиля"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490
 msgid "Add the selected available styles to the list of active styles"
 msgstr "Добавить выделенные доступные стили к списку активных стилей"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
 #, java-format
 msgid "Reloads the list of available styles from ''{0}''"
 msgstr "Скачать заново список доступных стилей из ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624
 msgid "Add a new icon path"
 msgstr "Добавить новый путь к значкам"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
 msgid "Remove the selected icon paths"
 msgstr "Удалить выделенные пути к значкам"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658
 msgid "Edit the selected icon path"
 msgstr "Править выделенные пути к значкам"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703
 #, java-format
 msgid "Loading style sources from ''{0}''"
 msgstr "Загрузить источники стилей из ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725
 #, java-format
 msgid ""
@@ -9700,6 +9736,6 @@
 "<br><br>Подробности (на англ.):<br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -9889,10 +9925,10 @@
 msgstr "Группы модификаторов"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
 msgid "<multiple>"
 msgstr "<множественный>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
@@ -9903,13 +9939,13 @@
 msgstr[2] "Удалить старые ключи из  {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134
 msgid "Add a new tag"
 msgstr "Добавить новый тег"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159
 msgid "Delete the selection in the tag table"
 msgstr "Удалить отмеченное в таблице тегов"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
@@ -9917,18 +9953,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472
 msgid "Optional Attributes:"
 msgstr "Дополнительные атрибуты:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
 msgid "closedway"
 msgstr "замкнутая линия"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Неизвестный тип: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -9939,15 +9975,15 @@
 msgstr "Не удалось прочитать источник заготовок тегов: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Ошибка при разборе {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Элемент типа {0} не поддерживается."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -9958,18 +9994,18 @@
 msgstr[2] "Изменить {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Ничего не выделено!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730
 msgid "Selection unsuitable!"
 msgstr "Неудачный выбор!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738
 msgid "Apply Preset"
 msgstr "Применить шаблон"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813
 msgid "Change Properties"
 msgstr "Изменить параметры"
@@ -9985,6 +10021,6 @@
 msgstr "Группа заготовок {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
@@ -9993,8 +10029,21 @@
 msgstr "Подключение к серверу OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47
 #, java-format
 msgid "Downloading points {0} to {1}..."
 msgstr "Скачивание точек с {0} до {1}..."
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#, java-format
+msgid "Failed to parse date ''{0}'' replied by server."
+msgstr "Сервер сообщил о неудавшемся разборе даты ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37
+#, fuzzy, java-format
+msgid ""
+"Unexpected format of error header for conflict in changeset update. Got "
+"''{0}''"
+msgstr "сервер вернул неожиданный формат id, текущее значение \"{0}\""
 
 #. SAXException does not chain correctly
@@ -10111,5 +10160,5 @@
 msgstr "Неизвестный режим {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115
 #, java-format
 msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
@@ -10118,6 +10167,6 @@
 "элемента."
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36
@@ -10127,40 +10176,40 @@
 msgstr "Скачивание данных OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361
 #, java-format
 msgid "Fetching node with id {0} from ''{1}''"
 msgstr "Выборка точки с id {0} из ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362
 #, java-format
 msgid "Fetching way with id {0} from ''{1}''"
 msgstr "Выборка линии с id {0} из ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363
 #, java-format
 msgid "Fetching relation with id {0} from ''{1}''"
 msgstr "Выборка отношения с id {0} из ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
 msgstr "Сервер выдал ошибку 404 для id {0}. Пропускаем"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399
 #, java-format
 msgid "Fetching a package of nodes from ''{0}''"
 msgstr "Выборка пакета точек из ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400
 #, java-format
 msgid "Fetching a package of ways from ''{0}''"
 msgstr "Выборка пакета линий из ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401
 #, java-format
 msgid "Fetching a package of relations from ''{0}''"
 msgstr "Выборка пакета отношений из ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
@@ -10227,5 +10276,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322
 #, java-format
 msgid "Unexpected format of ID replied by the server. Got ''{0}''."
@@ -10240,66 +10289,66 @@
 "\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314
 msgid "Creating changeset..."
 msgstr "Создание пакета правок..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr "Успешно открытый пакет правок {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
 msgid "Updating changeset..."
 msgstr "Обновление пакета правок..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr "Обновление пакета правок {0}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
 msgid "Closing changeset..."
 msgstr "Закрытие пакета правок..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410
 msgid "No changeset present for diff upload."
 msgstr "Нет пакетов правок для загрузки отличий"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
 msgid "Preparing..."
 msgstr "Подготовка..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422
 msgid "Uploading..."
 msgstr "Загрузка на сервер..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439
 msgid "Waiting 10 seconds ... "
 msgstr "Ожидание 10 секунд ... "
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr "Попытка {0} из {1} через {2} секунды..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450
 msgid "OK - trying again."
 msgstr "OK - пробуем ещё раз."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "Попытка {0} из {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611
 msgid "Current changeset is null. Can't upload data."
 msgstr "Текущий пакет правок пуст. Невозможно загрузить данные."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr "Требуется, чтобы ID текущего пакета правок был > 0. Текущий ID: {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
@@ -10336,5 +10385,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -10361,5 +10410,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -10367,5 +10416,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
 #, java-format
 msgid "Unsupported version: {0}"
@@ -10378,5 +10427,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -10541,5 +10590,5 @@
 msgstr "Файл \"{0}\" не существует"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207
 #, java-format
 msgid ""
@@ -10550,19 +10599,19 @@
 "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr "Найден элемент XML <nd>, не являющийся дочерним элементом для <way>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr "Отсутствует обязательный атрибут ''{0}'' на <nd> линии {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr "Неверное значение атрибута ''ref'' элемента <nd>. Получено {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
@@ -10570,10 +10619,10 @@
 "<relation>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr "Отсутствует атрибут ''ref'' у участника отношений {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
@@ -10581,10 +10630,10 @@
 "Неверное значение атрибута ''ref'' у участника отношения {0}. Получено {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr "Отсутствует атрибут ''type'' у участника {0} отношения {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
 #, java-format
 msgid ""
@@ -10594,9 +10643,9 @@
 "{2}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Неполная спецификация <member> с ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
@@ -10604,10 +10653,10 @@
 "Неопределённый элемент ''{0}'' обнаружен во входящем потоке. Пропущено."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323
 msgid "Illegal object with ID=0."
 msgstr "Недопустимый объект с id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -10619,10 +10668,8 @@
 
 #. default version in 0.5 files for existing primitives
-#. default version in 0.5 files for new primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377
 #, java-format
 msgid ""
@@ -10634,25 +10681,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr "Неизвестная или неподдерживаемая версия API. Получено {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr "Отсутствует атрибут ''version'' на элементе OSM с ID {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr "Отсутствует нужный атрибут ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr "Неверная длина значения атрибута ''{0}''. Получено ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -11140,5 +11187,5 @@
 msgstr "(Текст уже скопирован в буфер обмена)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
 #, java-format
 msgid ""
@@ -11149,15 +11196,5 @@
 "адрес сервера в настройках и соединение с интернет.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#, java-format
-msgid ""
-"<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-"changeset will automatically be closed by the server after a timeout.</html>"
-msgstr ""
-"<html>Невозможно закрыть пакет правок ''{0}'' на сервере OSM ''{1}''."
-"<br>Пакет правок будет автоматически закрыт сервером по истечении времени "
-"ожидания.</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
 #, java-format
 msgid ""
@@ -11170,5 +11207,5 @@
 "удалите ссылку на отношение {0}, затем снова загрузите на сервер.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
 #, java-format
 msgid ""
@@ -11181,10 +11218,5 @@
 "{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
-#, java-format
-msgid "Failed to parse date ''{0}'' replied by server."
-msgstr "Сервер сообщил о неудавшемся разборе даты ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
 #, java-format
 msgid ""
@@ -11195,5 +11227,5 @@
 "он уже был закрыт.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
 #, java-format
 msgid ""
@@ -11204,5 +11236,5 @@
 "он уже был закрыт в {1}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
 #, java-format
 msgid ""
@@ -11213,9 +11245,18 @@
 "(англ.):<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr "<html>Сервер сообщил, что обнаружен конфликт.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to upload to changeset <strong>{0}</strong><br>because it has "
+"already been closed on {1}.</html>"
+msgstr ""
+"<html>Закрытие пакета правок <strong>{0}</strong> не удалось<br>, потому что "
+"он уже был закрыт в {1}.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
 #, java-format
 msgid ""
@@ -11228,5 +11269,5 @@
 "формы приложения ''{1}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
 #, java-format
 msgid ""
@@ -11237,5 +11278,5 @@
 "<br>Пожалуйста проверьте свое подключение к интернету.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -11246,5 +11287,5 @@
 "проблемы передачи данных.<br>Подробнее: {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -11255,10 +11296,10 @@
 "временная проблема. Пожалуйста, попробуйте позднее.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr "Сервер OSM ''{0}'' сообщил о неудачном запросе.<br>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -11270,10 +11311,10 @@
 "средствами экспорта файлов OSM."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr "<br>Сообщение об ошибке (на английском): {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
 #, java-format
 msgid ""
@@ -11288,5 +11329,5 @@
 "Пожалуйста, внимательно проверьте адрес сервера ''{0}'' на предмет опечаток."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
 #, java-format
 msgid ""
@@ -11299,5 +11340,5 @@
 "программы и ваше соединение с интернет.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
 #, java-format
 msgid ""
@@ -12061,5 +12102,5 @@
 msgstr "Ошибка в файле {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97
 #, java-format
 msgid ""
@@ -12075,29 +12116,49 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387
 msgid "Select Feuille"
 msgstr "Выбрать Feuille (слой??)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432
 msgid "Error loading file"
 msgstr "Ошибка при загрузке файла"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17
-msgid "Lambert Zone 1 cache file (.1)"
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20
+#, fuzzy, java-format
+msgid "Lambert Zone {0} cache file (.{0})"
 msgstr "Lambert зона 1 кэш файл (.1)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18
-msgid "Lambert Zone 2 cache file (.2)"
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27
+#, fuzzy, java-format
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgstr "Lambert зона 1 кэш файл (.1)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19
+#, fuzzy
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20
+#, fuzzy
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
 msgstr "Lambert зона 21 кэш файл (.2)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19
-msgid "Lambert Zone 3 cache file (.3)"
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21
+#, fuzzy
+msgid "Martinique Fort Desaix cache file (.UTM3)"
 msgstr "Lambert зона 3 кэш файл (.3)"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20
-msgid "Lambert Zone 4 cache file (.4)"
-msgstr "Lambert зона 4 кэш файл (.4)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42
@@ -12128,13 +12189,13 @@
 msgstr "Выбрать из..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
 msgid "Cadastre"
 msgstr "Кадастр"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151
 msgid "Auto sourcing"
 msgstr "Авто источники"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -12146,13 +12207,13 @@
 "Вы хотите назначить на клавишу F11 функцию захвата?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209
 msgid "Restore grab shortcut F11"
 msgstr "Восстановить действие захватывающей клавиши F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM остановлено для того, чтобы проявились изменения."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276
 #, java-format
 msgid ""
@@ -12460,43 +12521,48 @@
 msgstr "Установить {0} Lambert координаты"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33
-msgid "Set manually the Lambert zone"
-msgstr "Задать вручную Lambert zone"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44
-msgid "Zone"
-msgstr "Зона"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
-msgid "Lambert zone"
-msgstr "Зона Ламберта"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24
 msgid "Load location from cache (only if cache is enabled)"
 msgstr "Загрузка расположения из кэша (только если кэш включен)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
 #, java-format
 msgid "{0} not allowed with the current projection"
 msgstr "{0} не позволено в текущей проекции"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57
+#, fuzzy, java-format
+msgid ""
+"Cannot load cache {0} which is not compatible with current projection zone"
+msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63
+#, java-format
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
+#, java-format
+msgid "The location {0} is already on screen. Cache not loaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28
 msgid "Change location"
 msgstr "Изменить расположение"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28
 msgid "Set a new location for the next request"
 msgstr "Установить новое место для следующего запроса"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
 msgid "Add a new layer"
 msgstr "Добавить новый слой"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 #: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Расположение"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -12506,5 +12572,5 @@
 "пунктуацию опубликованную www.cadastre.gouv.fr </html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
 msgid "Add new layer"
 msgstr "Добавить новый слой"
@@ -12536,5 +12602,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "Подстроить WMS"
@@ -12566,5 +12632,5 @@
 "Выберите сначала один из них, а затем повторите"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
@@ -12572,28 +12638,28 @@
 msgstr "Пустой слой"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "слой WMS ({0}), квадратов загружено: {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
 msgid "Is not vectorized."
 msgstr "Не векторизованны."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Размер растра: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189
 msgid "Is vectorized."
 msgstr "Векторизован."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "общий квадрат: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -12604,29 +12670,16 @@
 "Создайте новый файл."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr "Ошибка формата кеша"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr "Ошибка кеширования зоны Ламберта"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
-#, java-format
-msgid ""
-"Current layer is in Lambert CC9 Zone \"{0}\"\n"
-"where the commune is in Lambert CC9 Zone \"{1}\".\n"
-"Upload your changes, close all layers and change\n"
-"manually the Lambert zone from the Cadastre menu"
-msgstr ""
-"Текущий слой в Lambert CC9 Zone это \"{0}\"\n"
-"где коммуна в Lambert CC9 Zone это \"{1}\".\n"
-"Загрузите на сервер изменения, закройте все слои\n"
-"и измените вручную Lambert zone в меню Кадастр"
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
@@ -13691,20 +13744,20 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246
 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:230
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247
 msgid "Confirm Remote Control action"
 msgstr "Подтверждение действия дистанционного управления"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232
 msgid "Remote Control has been asked to create a new node."
 msgstr "Пультом управления было предложено создать новую точку."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -13828,13 +13881,9 @@
 msgstr "Отдалить"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214
-msgid "Snap to tile size"
-msgstr "Привязаться к размеру квадрата"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232
 msgid "Flush Tile Cache"
 msgstr "Очистить кеш квадрата карты"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668
 msgid "image "
 msgstr "изображение "
@@ -14426,5 +14475,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-msgid "Unconnceted coastline"
+#, fuzzy
+msgid "Unconnected coastline"
 msgstr "Неприсоединённая береговая линия"
 
@@ -15091,12 +15141,10 @@
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58
-#, fuzzy
 msgid "Way Download"
-msgstr "Скачать"
+msgstr "Скачать линию"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
-#, fuzzy
 msgid "Download map data on the end of selected way"
-msgstr "Скачать картографические данные с сервера OSM."
+msgstr "Скачать данные карты, лежащие на конце выбранной линии"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99
@@ -15110,11 +15158,10 @@
 msgid "<html>Could not find a unique node to start downloading from.</html>"
 msgstr ""
+"<html>Не удалось найти уникальную точку, чтобы начать с неё загрузку.</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
-msgstr ""
-"<html>Нет слоёв, с которым исходный слой<br>''{0}''<br>может быть объединён."
-"</html>"
+msgstr "<html>Нет линий, присоединённых к точке ''{0}''. Отменено.</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168
@@ -15124,4 +15171,6 @@
 "discovered after download"
 msgstr ""
+"Данные модуля скачивания линии неполные. Ранее присоединённая линия ''{0}'' "
+"не была обнаружена после скачивания с сервера"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:182
@@ -15136,18 +15185,15 @@
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195
-#, fuzzy
 msgid "Merge duplicate node?"
-msgstr "Удаление повторяющихся точек..."
+msgstr "Объединить дубликаты точек?"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212
-#, fuzzy
 msgid "<html>No more connected ways to download.</html>"
-msgstr ""
-"<html>В настоящий момент не выбрана область для скачивания с сервера.</html>"
+msgstr "<html>Нет больше присоединённых линий для скачивания с сервера.</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:221
 #, java-format
 msgid "Node ''{0}'' is a junction with more than 2 connected ways."
-msgstr ""
+msgstr "Точка ''{0}'' это соединение более, чем 2 пересекающихся линий."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
@@ -15208,29 +15254,29 @@
 msgstr "Нет верных WMS URL или ID"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr "Отрегулируйте положение выбранного слоя WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
 msgid "Please select the WMS layer to adjust."
 msgstr "Пожалуйста, выберите слой WMS для выравнивания"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
 msgid "Select WMS layer"
 msgstr "Выбрать слой WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179
 msgid "Start adjusting"
 msgstr "Начало выравнивания"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
 msgid "There are currently no WMS layer to adjust."
 msgstr "Нет слоя WMS для выравнивания."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199
 msgid "No layers to adjust"
 msgstr "Нет слоёв для выравнивания"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115
 #, java-format
 msgid ""
@@ -15241,5 +15287,5 @@
 "знак '&' или '?'."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -15249,10 +15295,10 @@
 "Пожалуйста, проверьте настройки параметров."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "Предупреждение: Полная ссылка: ''{0}''."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138
 #, java-format
 msgid ""
@@ -15267,5 +15313,5 @@
 msgstr "Автоматическое скачивание"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -15274,19 +15320,19 @@
 "искажена"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
 msgid "(deactivated)"
 msgstr "(деактивировано)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198
 #, java-format
 msgid ""
@@ -15301,13 +15347,13 @@
 "попытаться извлечь квадраты WMS?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 msgid "Yes, fetch images"
 msgstr "Да, выбрать изображения"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 msgid "Invalid URL?"
 msgstr "Ошибочная ссылка?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -15316,37 +15362,37 @@
 "измените разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Download visible tiles"
 msgstr "Скачать видимые квадраты карты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid "Change resolution"
 msgstr "Изменить разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Reload erroneous tiles"
 msgstr "Перезагрузить ошибочные квадраты карты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348
 msgid "Alpha channel"
 msgstr "Альфа канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
 msgid "Save WMS layer to file"
 msgstr "Сохранить слой WMS в файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372
 msgid "Save WMS layer"
 msgstr "Сохраниеть WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
 msgid "Load WMS layer from file"
 msgstr "Загрузить слой WMS из файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
 msgid "Load WMS layer"
 msgstr "Загрузить WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -15354,7 +15400,12 @@
 "Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "File Format Error"
 msgstr "Ошибка формата файла"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
+#, fuzzy
+msgid "Set WMS Bookmark"
+msgstr "Создать закладку"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
@@ -27719,8 +27770,7 @@
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *
+#. *    : W : natural == water && waterway == *                   # unusual tag combination
 #. *    : W : highway == * && waterway == *
-#: build/trans_validator.java:77 build/trans_validator.java:78
-#: build/trans_validator.java:79
+#: build/trans_validator.java:78 build/trans_validator.java:79
 msgid "unusual tag combination"
 msgstr "необычная комбинация тегов"
@@ -27740,34 +27790,23 @@
 
 #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
-#. fails with division by zero error
-#: build/trans_wms.java:8
-msgid "NPE Maps"
-msgstr "карты NPE"
-
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:9
-msgid "NPE Maps (Tim)"
-msgstr "NPE Карты (Tim)"
-
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
 #.
 #. different forms for web access
 #. must be html:<url>
-#: build/trans_wms.java:13
+#: build/trans_wms.java:10
 msgid "Yahoo Sat"
 msgstr "Yahoo Sat"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
-#: build/trans_wms.java:14
+#: build/trans_wms.java:11
 msgid "OpenStreetMap"
 msgstr "OpenStreetMap"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
-#: build/trans_wms.java:15
+#: build/trans_wms.java:12
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
-#: build/trans_wms.java:16
+#: build/trans_wms.java:13
 msgid "TilesAtHome"
 msgstr "TilesAtHome"
@@ -27777,9 +27816,12 @@
 #.
 #. only for Germany
-#: build/trans_wms.java:20
+#: build/trans_wms.java:17
 msgid "Streets NRW Geofabrik.de"
 msgstr "Улицы NRW Geofabrik.de"
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#.
+#.
+#. only for North America
 #. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
@@ -27793,102 +27835,165 @@
 
 #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
+#.
+#.
 #. only for Czech Republic
-#: build/trans_wms.java:25
+#: build/trans_wms.java:27
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:28
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Czech UHUL:ORTOFOTO"
 
-#~ msgid "Can't search because there is no loaded data."
-#~ msgstr "Поиск невозможен, так как не загружено никаких данных."
-
-#~ msgid "There's no primitive with version {0} in this history."
-#~ msgstr "В этой истории не существует элемента версии {0}"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history."
-#~ msgstr "Нет версии действительной для даты \"{0}\" в этой истории"
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "более ранняя версия не найдена. История пуста."
-
-#~ msgid "No latest version found. History is empty."
-#~ msgstr "более поздняя версия не найдена. История пуста."
-
-#~ msgid "No type found. History is empty."
-#~ msgstr "Тип не найден. История пуста."
-
-#~ msgid "Didn't find an primitive with id {0} in this dataset"
-#~ msgstr "Элемент с id {0} не был найден в этом наборе данных"
-
-#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-#~ msgstr "Элемент с id {0} и версией {1} не был найден в этом наборе данных"
-
-#~ msgid "Select a starting node on the end of a way"
-#~ msgstr "Выделите начальную точку на конце линии"
-
-#~ msgid "Reached the end of the line"
-#~ msgstr "Достигнут конец линии"
-
-#~ msgid "Reached a junction"
-#~ msgstr "Достигнут перекрёсток"
-
-#~ msgid "help"
-#~ msgstr "Справка"
-
-#~ msgid "Help / About"
-#~ msgstr "Справка / О модуле"
+#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
+#.
+#.
+#. only for GB
+#. fails with division by zero error
+#: build/trans_wms.java:33
+msgid "NPE Maps"
+msgstr "карты NPE"
+
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
+#: build/trans_wms.java:34
+msgid "NPE Maps (Tim)"
+msgstr "NPE Карты (Tim)"
+
+#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
+#: build/trans_wms.java:35
+msgid "7th Series (OS7)"
+msgstr ""
+
+#. http://ooc.openstreetmap.org/wms/map.php?source=os7&
+#.
+#.
+#. only for Japan
+#: build/trans_wms.java:39
+msgid "MLIT Japan (ORTHO)"
+msgstr ""
+
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#: build/trans_wms.java:40
+msgid "MLIT Japan (ORTHO01)"
+msgstr ""
+
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#: build/trans_wms.java:41
+msgid "MLIT Japan (ORTHO02)"
+msgstr ""
+
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#: build/trans_wms.java:42
+msgid "MLIT Japan (ORTHO03)"
+msgstr ""
+
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#.
+#.
+#. only for Italy
+#: build/trans_wms.java:46
+msgid "Lodi - Italy"
+msgstr ""
+
+#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
+#: build/trans_wms.java:47
+msgid "Sicily - Italy"
+msgstr ""
+
+#~ msgid "Lambert Zone 2 cache file (.2)"
+#~ msgstr "Lambert зона 21 кэш файл (.2)"
+
+#~ msgid "Lambert Zone 3 cache file (.3)"
+#~ msgstr "Lambert зона 3 кэш файл (.3)"
+
+#~ msgid "Lambert Zone 4 cache file (.4)"
+#~ msgstr "Lambert зона 4 кэш файл (.4)"
+
+#, fuzzy
+#~ msgid "Lambert CC9 Zone 2 cache file (.CC2)"
+#~ msgstr "Lambert зона 21 кэш файл (.2)"
+
+#, fuzzy
+#~ msgid "Lambert CC9 Zone 3 cache file (.CC3)"
+#~ msgstr "Lambert зона 3 кэш файл (.3)"
+
+#, fuzzy
+#~ msgid "Lambert CC9 Zone 4 cache file (.CC4)"
+#~ msgstr "Lambert зона 4 кэш файл (.4)"
+
+#, fuzzy
+#~ msgid "Lambert CC9 Zone 5 cache file (.CC5)"
+#~ msgstr "Lambert зона 1 кэш файл (.1)"
+
+#, fuzzy
+#~ msgid "Lambert CC9 Zone 6 cache file (.CC6)"
+#~ msgstr "Lambert зона 1 кэш файл (.1)"
+
+#, fuzzy
+#~ msgid "Lambert CC9 Zone 7 cache file (.CC7)"
+#~ msgstr "Lambert зона 1 кэш файл (.1)"
+
+#, fuzzy
+#~ msgid "Lambert CC9 Zone 8 cache file (.CC8)"
+#~ msgstr "Lambert зона 1 кэш файл (.1)"
+
+#, fuzzy
+#~ msgid "Lambert CC9 Zone 9 cache file (.CC9)"
+#~ msgstr "Lambert зона 1 кэш файл (.1)"
+
+#~ msgid "null detected in node list"
+#~ msgstr "обнаружено значение null в списке точек"
+
+#~ msgid "unexpected null value for n.getEastNorth(). id of n is"
+#~ msgstr "неожиданное значение null для n.getEastNorth(). id из n"
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
-#~ "- these will then show up in the WMS menu.\n"
-#~ "\n"
-#~ "You can also do this manually in the Advanced Preferences, using the "
-#~ "following schema:\n"
-#~ "wmsplugin.url.1.name=Landsat\n"
-#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
-#~ "\n"
-#~ "Full WMS URL input format example (landsat)\n"
-#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
-#~ "\n"
-#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
-#~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
-#~ "in this example, replacing 73 with your image id:\n"
-#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
-#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
-#~ "\n"
-#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
-#~ "use."
+#~ "IMPORTANT : data positioned far away from\n"
+#~ "the current Lambert zone limits.\n"
+#~ "Do not upload any data after this message.\n"
+#~ "Undo your last action, save your work\n"
+#~ "and start a new layer on the new zone."
 #~ msgstr ""
-#~ "Можно добавлять, редактировать и удалять сервисы WMS на вкладке "
-#~ "\"Параметры модуля WMS\" - они будут отображены в меню WMS.\n"
-#~ "\n"
-#~ "Также можно сделать это вручную в \"Расширенных настройках\", используя "
-#~ "следующую схему:\n"
-#~ "wmsplugin.url.1.name=Landsat\n"
-#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-#~ "wmsplugin.url.2.name=NPE Maps... и так далее\n"
-#~ "\n"
-#~ "Пример входного формата: полный URL WMS (landsat)\n"
-#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
-#~ "\n"
-#~ "Для Metacarta's Map Rectifier (http://labs.metacarta.com/rectifier/) , "
-#~ "всё что нужно - ввести соответствующий 'id'.\n"
-#~ "Чтобы добавить пункт меню \"Metacarta Map Rectifier\", создайте URL как в "
-#~ "приведённом примере, заменив 73 на id вашего изображения:\n"
-#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
-#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
-#~ "\n"
-#~ "Примечание: Убедитесь что использование изображения легально, если в этом "
-#~ "есть хоть какие-то сомнения - не используйте его."
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "Справка по модулю WMS"
+#~ "ВАЖНО : данные расположены слишком\n"
+#~ "далеко от текущих границ Lambert зоны.\n"
+#~ "Не загружайте пока никаких данных .\n"
+#~ "Отмените последнее действие, сохраните\n"
+#~ "данные и начните новый слой в новой зоне."
+
+#~ msgid "Edit Properties"
+#~ msgstr "Изменить параметры"
+
+#~ msgid "Linked"
+#~ msgstr "Связанные"
+
+#~ msgid ""
+#~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
+#~ "changeset will automatically be closed by the server after a timeout.</"
+#~ "html>"
+#~ msgstr ""
+#~ "<html>Невозможно закрыть пакет правок ''{0}'' на сервере OSM ''{1}''."
+#~ "<br>Пакет правок будет автоматически закрыт сервером по истечении времени "
+#~ "ожидания.</html>"
+
+#~ msgid "Set manually the Lambert zone"
+#~ msgstr "Задать вручную Lambert zone"
+
+#~ msgid "Zone"
+#~ msgstr "Зона"
+
+#~ msgid ""
+#~ "Current layer is in Lambert CC9 Zone \"{0}\"\n"
+#~ "where the commune is in Lambert CC9 Zone \"{1}\".\n"
+#~ "Upload your changes, close all layers and change\n"
+#~ "manually the Lambert zone from the Cadastre menu"
+#~ msgstr ""
+#~ "Текущий слой в Lambert CC9 Zone это \"{0}\"\n"
+#~ "где коммуна в Lambert CC9 Zone это \"{1}\".\n"
+#~ "Загрузите на сервер изменения, закройте все слои\n"
+#~ "и измените вручную Lambert zone в меню Кадастр"
+
+#~ msgid "Snap to tile size"
+#~ msgstr "Привязаться к размеру квадрата"
 
 #~ msgid "No data imported."
@@ -28108,4 +28213,10 @@
 #~ msgid "Adjust the position of the WMS layer"
 #~ msgstr "Подстроить положение слоя WMS"
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "Справка по модулю WMS"
+
+#~ msgid "Help / About"
+#~ msgstr "Справка / О модуле"
 
 #~ msgid "Navigation"
@@ -28645,4 +28756,10 @@
 #~ msgstr "Сбой инициализации API. Пожалуйста, попробуйте снова позднее."
 
+#~ msgid "Reached the end of the line"
+#~ msgstr "Достигнут конец линии"
+
+#~ msgid "Reached a junction"
+#~ msgstr "Достигнут перекрёсток"
+
 #~ msgid "removing reference from way {0}"
 #~ msgstr "удаление ссылки из линии {0}"
@@ -28751,4 +28868,7 @@
 #~ "его после загрузки"
 
+#~ msgid "Can't search because there is no loaded data."
+#~ msgstr "Поиск невозможен, так как не загружено никаких данных."
+
 #~ msgid "Use the existing changeset {0} and close it after upload"
 #~ msgstr ""
@@ -28809,4 +28929,10 @@
 #~ msgid "Purging 1 primitive"
 #~ msgstr "Очистка 1 элемента"
+
+#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
+#~ msgstr "Элемент с id {0} и версией {1} не был найден в этом наборе данных"
+
+#~ msgid "Didn't find an primitive with id {0} in this dataset"
+#~ msgstr "Элемент с id {0} не был найден в этом наборе данных"
 
 #~ msgid "Primitive already deleted"
@@ -28834,4 +28960,7 @@
 #~ "ошибке:<br>{0}</html>"
 
+#~ msgid "Select a starting node on the end of a way"
+#~ msgstr "Выделите начальную точку на конце линии"
+
 #~ msgid "Only two nodes allowed"
 #~ msgstr "Можно только две точки"
@@ -28847,4 +28976,13 @@
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "неожиданное возвращённое значение. Получено {0}"
+
+#~ msgid "There's no version valid at date ''{0}'' in this history."
+#~ msgstr "Нет версии действительной для даты \"{0}\" в этой истории"
+
+#~ msgid "No earliest version found. History is empty."
+#~ msgstr "более ранняя версия не найдена. История пуста."
+
+#~ msgid "No latest version found. History is empty."
+#~ msgstr "более поздняя версия не найдена. История пуста."
 
 #~ msgid "Index out of bounds. Got {0}."
@@ -28867,6 +29005,56 @@
 #~ msgstr "Показать историю выделенного элемента"
 
+#~ msgid "There's no primitive with version {0} in this history."
+#~ msgstr "В этой истории не существует элемента версии {0}"
+
 #~ msgid "MIddle way: {0}"
 #~ msgstr "Середина линии: {0}"
+
+#~ msgid ""
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
+#~ "\n"
+#~ "You can also do this manually in the Advanced Preferences, using the "
+#~ "following schema:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "Full WMS URL input format example (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
+#~ "\n"
+#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
+#~ "only need to input the relevant 'id'.\n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example, replacing 73 with your image id:\n"
+#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
+#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
+#~ "\n"
+#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
+#~ "use."
+#~ msgstr ""
+#~ "Можно добавлять, редактировать и удалять сервисы WMS на вкладке "
+#~ "\"Параметры модуля WMS\" - они будут отображены в меню WMS.\n"
+#~ "\n"
+#~ "Также можно сделать это вручную в \"Расширенных настройках\", используя "
+#~ "следующую схему:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... и так далее\n"
+#~ "\n"
+#~ "Пример входного формата: полный URL WMS (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
+#~ "\n"
+#~ "Для Metacarta's Map Rectifier (http://labs.metacarta.com/rectifier/) , "
+#~ "всё что нужно - ввести соответствующий 'id'.\n"
+#~ "Чтобы добавить пункт меню \"Metacarta Map Rectifier\", создайте URL как в "
+#~ "приведённом примере, заменив 73 на id вашего изображения:\n"
+#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
+#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
+#~ "\n"
+#~ "Примечание: Убедитесь что использование изображения легально, если в этом "
+#~ "есть хоть какие-то сомнения - не используйте его."
 
 #~ msgid "Show Tile Status"
@@ -28938,4 +29126,10 @@
 #~ msgstr "Обновить выделенные элементы с сервера"
 
+#~ msgid "help"
+#~ msgstr "Справка"
+
+#~ msgid "No type found. History is empty."
+#~ msgstr "Тип не найден. История пуста."
+
 #~ msgid "longitude"
 #~ msgstr "долгота"
