Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 19199)
+++ applications/editors/josm/i18n/po/ru.po	(revision 19246)
@@ -5,11 +5,13 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-23 17:04+0100\n"
-"PO-Revision-Date: 2009-12-17 08:20+0000\n"
-"Last-Translator: Calibrator <Unknown>\n"
+"POT-Creation-Date: 2010-01-01 14:44+0100\n"
+"PO-Revision-Date: 2009-12-26 13:15+0000\n"
+"Last-Translator: kruvalig <Unknown>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -18,5 +20,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-12-23 15:30+0000\n"
+"X-Launchpad-Export-Date: 2010-01-01 13:22+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -24,5 +26,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Creating main GUI"
 msgstr "Создание интерфейса"
@@ -31,8 +33,8 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:218
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
 #: ../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:302
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:314
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -40,11 +42,11 @@
 msgstr "Справка"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:431
+#: ../core/src/org/openstreetmap/josm/Main.java:425
 #, 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:426
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -72,10 +74,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:638
 #: ../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/GpxLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
@@ -98,35 +101,29 @@
 msgstr "Предупреждение"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:451
+#: ../core/src/org/openstreetmap/josm/Main.java:445
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Игнорирование неправильной ссылки на файл: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:464
-#: ../core/src/org/openstreetmap/josm/Main.java:472
-#: ../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
+#: ../core/src/org/openstreetmap/josm/Main.java:458
+#: ../core/src/org/openstreetmap/josm/Main.java:466
+#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:505
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:59
 #, 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/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81
-#: ../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:455
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
@@ -139,11 +136,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -154,4 +150,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:60
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:74
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -163,5 +161,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:343
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:415
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:49
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -185,9 +183,9 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:434
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "Error"
 msgstr "Ошибка"
@@ -206,8 +204,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
@@ -311,11 +309,11 @@
 #, java-format
 msgid "Click to continue and to open {0} browsers"
-msgstr ""
+msgstr "Нажмите, чтобы продолжить и открыть {0} в браузере"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:286
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
@@ -325,13 +323,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372
@@ -342,9 +341,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -352,6 +351,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:161
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
@@ -366,7 +365,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100
-#, fuzzy
 msgid "Click to abort launching external browsers"
-msgstr "Не удалось запустить внешний браузер справки"
+msgstr "Нажмите, чтобы отменить запуск внешнего браузера"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132
@@ -386,5 +384,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:428
 msgid "Merge"
 msgstr "Объединить"
@@ -406,5 +404,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:163
 msgid "Add Node..."
 msgstr "Добавить точку..."
@@ -433,17 +431,17 @@
 msgstr "Править: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:101
 msgid "Enter the coordinates for the new node."
 msgstr "Введите координаты новой точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102
 msgid "Use decimal degrees."
 msgstr "Использовать десятичные градусы"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Отрицательные значения обозначают западное/южное полушарие"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
 #: ../plugins/grid/src/grid/GridLayer.java:193
@@ -452,5 +450,5 @@
 msgstr "Широта"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
 #: ../plugins/grid/src/grid/GridLayer.java:195
@@ -459,29 +457,29 @@
 msgstr "Долгота"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:223
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Пожалуйста , введите правильную широту в диапазоне -90..90"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:226
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Введите широту в диапазоне -90..90"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:234
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Пожалуйста, введите правильную долготу в диапазоне -180..180"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:237
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Введите долготу в диапазоне -180..180"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:273
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -493,9 +491,9 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274
 msgid "Close the dialog and create a new node"
 msgstr "Закрыть диалог и создать новую точку"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287
 msgid "Close the dialog, don't create a new node"
 msgstr "Закрыть диалог, не создавая новую точку"
@@ -551,7 +549,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -568,7 +567,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:371
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:661
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
@@ -606,5 +605,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
 msgid "conflict"
 msgstr "конфликта"
@@ -614,16 +613,21 @@
 msgstr "скачанного"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:168
+msgid "Nothing selected to zoom to."
+msgstr "Ничего не выделено для масштабирования."
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Масштабировать до {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:88
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Приблизить вид до {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
@@ -633,14 +637,19 @@
 msgstr "Вид: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
-msgid "Nothing selected to zoom to."
-msgstr "Ничего не выделено для масштабирования."
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:168
 msgid "No conflicts to zoom to"
 msgstr "Нет конфликтов чтобы их приблизить"
 
+#: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:32
+msgid "Changeset Manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:37
+msgid "Toggle visibility of Changeset Manager window"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:401
 msgid "Close open changesets"
 msgstr "Закрыть открытые пакеты правок"
@@ -655,5 +664,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:43
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
@@ -712,10 +721,10 @@
 "последовательностью точек."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Объединить {0} линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 msgid "Please select at least two ways to combine."
 msgstr "Выделите не менее двух линий для объединения."
@@ -760,7 +769,7 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
@@ -770,5 +779,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -779,6 +788,6 @@
 msgstr "Удалить выделенные объекты."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
@@ -788,5 +797,5 @@
 msgstr "Перезаписать"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:59
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209
 msgid "File exists. Overwrite?"
@@ -838,9 +847,9 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:87
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:216
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:99
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:51
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:60
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:109
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1038
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76
@@ -855,5 +864,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
 #: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21
 #: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33
@@ -892,5 +901,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:1337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1364
 msgid "Duplicate"
 msgstr "Дублировать"
@@ -914,8 +923,4 @@
 msgstr "Выйти из программы"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235
-msgid "All Formats"
-msgstr "Все форматы"
-
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
 msgid "Fullscreen View"
@@ -949,8 +954,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:172
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:174
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:39
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
@@ -981,8 +986,7 @@
 #: ../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:257
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:426
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
@@ -999,10 +1003,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:97
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:111
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:96
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:112
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:126
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:143
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:158
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:121
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:123
@@ -1021,5 +1025,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:54
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1065,9 +1069,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125
-#, fuzzy
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
-"Пожалуйста, выберите по крайней мере, одну замкнутую линию, которые должны "
-"быть объединены."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131
@@ -1200,5 +1201,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
 msgid "URL"
 msgstr "URL"
@@ -1259,5 +1260,5 @@
 "используется."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:230
 #, java-format
 msgid "Merge {0} nodes"
@@ -1338,18 +1339,35 @@
 msgstr "Создать новую карту."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:43
 msgid "Open..."
 msgstr "Открыть..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42
 msgid "Open a file."
 msgstr "Открыть файл."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:75
 msgid "Opening files"
 msgstr "Открытие файлов"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:118
+msgid "<html>Cannot open directory.<br>Please select a file!"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:119
+msgid "Open file"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:159
+msgid "Opening 1 file..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161
+#, java-format
+msgid "Opening {0} files..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1467,4 +1485,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 msgid "Paste"
 msgstr "Вставить"
@@ -1662,6 +1681,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1780,5 +1801,5 @@
 "необходимо проверить и исправить, если потребуется.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:436
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1920,7 +1941,17 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:971
 msgid "Download data"
 msgstr "Скачать данные"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:27
+msgid "Update modified"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:25
+msgid ""
+"Updates the currently modified objects from the server (re-downloads data)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74
@@ -1934,4 +1965,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
 msgid "Update selection"
 msgstr "Обновить выбор"
@@ -1944,13 +1976,9 @@
 "заново)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
-msgid "Update Selection"
-msgstr "Обновить выборку"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
 msgid "There are no selected objects to update."
 msgstr "Нет выбранных объектов для обновления."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
 msgid "Selection empty"
 msgstr "Выборка пуста"
@@ -2153,5 +2181,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:113
 msgid "Ignore"
 msgstr "Игнорировать"
@@ -2209,10 +2237,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
 msgid "Mode: {0}"
 msgstr "Режим: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:245
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2261,14 +2289,14 @@
 msgstr "Добавить точку к линии и объединить"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 msgid "Create new node."
 msgstr "Создать новую точку"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967
 msgid "Select node under cursor."
 msgstr "Выделить точку под курсором."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
 #, java-format
 msgid "Insert new node into way."
@@ -2278,14 +2306,14 @@
 msgstr[2] "Вставить новую точку в {0} линий"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Start new way from last node."
 msgstr "Начать новую линию с последней точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Continue way from last node."
 msgstr "Продолжить линию с последней точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980
 msgid "Finish drawing."
 msgstr "Закончено вычерчивание"
@@ -2333,9 +2361,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:145
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
 msgid "Select"
 msgstr "Выбор"
@@ -2376,13 +2404,9 @@
 "часто производится по ошибке. Действительно переместить их?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476
-msgid "Always move and don't show dialog again"
-msgstr "Всегда перемещать и больше не показывать этого предупреждения"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
 msgid "Release the mouse button to select the objects in the rectangle."
 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 stop moving. Ctrl to merge with nearest node."
@@ -2391,9 +2415,9 @@
 "объединения с ближайшей точкой."
 
-#: ../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 rotating."
 msgstr "Отпустите кнопку мыши, чтобы прекратить вращение."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2406,5 +2430,4 @@
 #: ../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/gui/download/PlaceSelection.java:416
 msgid "Zoom"
 msgstr "Масштаб"
@@ -2428,5 +2451,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
 msgid "Search for objects."
 msgstr "Поиск объектов."
@@ -2527,50 +2550,56 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
-#, fuzzy
+msgid ""
+"<b>version:</b>... - object with given version (0 objects without an "
+"assigned version)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
 "assigned changeset)"
-msgstr "<b>точки:</b>... - объект с заданным количеством точек"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid ""
 "<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
 "min-max)"
 msgstr ""
+"<b>nodes:</b>... - объект с заданным количеством узлов (nodes:count or nodes:"
+"min-max)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr ""
 "<b>tags:</b>... - объект с заданным количеством тегов (tags:кол-во или tags:"
 "мин-макс)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-msgid ""
-"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
-"max)"
-msgstr ""
-"<b>tags:</b>... - объект с заданным количеством тегов (tags:кол-во или tags:"
-"мин-макс)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
 "12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+"<b>timestamp:</b>... -  объект с временной меткой (<b>2009-11-12T14:51:09Z</"
+"b>, <b>2009-11-12</b> или <b>T14:51</b> ...)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - все измененные объекты"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - все выделенные объекты"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - все незаконченные объекты"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - все объекты без тегов"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2579,5 +2608,5 @@
 "выражению"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2586,5 +2615,5 @@
 "выражению"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
@@ -2592,5 +2621,5 @@
 "«или»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
@@ -2598,9 +2627,9 @@
 "ключ содержит двоеточие)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 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:150
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53
@@ -2610,51 +2639,51 @@
 msgstr "Фильтр"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
 msgid "Search"
 msgstr "Поиск"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
 msgid "Submit filter"
 msgstr "Принять фильтр"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
 msgid "Start Search"
 msgstr "Начать поиск"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Не найдено совпадений для ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275
 #, java-format
 msgid "Nothing added to 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:277
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Ничего не удалено из выделения в результате поиска ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:279
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Ничего не найдено в выделенном, при поиске ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:289
 #, java-format
 msgid "Found {0} matches"
 msgstr "Найдено {0} совпадений"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:318
 msgid "RX"
 msgstr "RX"
@@ -2671,5 +2700,5 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:227
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2677,10 +2706,10 @@
 "использования: ключ=значение"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:269
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 msgstr "Ошибка синтаксиса шаблона: Шаблон {0} в {1} недопустим!"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:415
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2689,29 +2718,26 @@
 "отношение"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:603
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Неожиданный знак: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614
 msgid "Missing parameter for OR"
-msgstr "Отсутствуют параметры для \"ИЛИ\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627
-#, fuzzy
-msgid "Missing right parent"
-msgstr "Отсутствуют параметры для \"НЕ\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630
-#, fuzzy
+msgstr "Пропущен параметр для OR"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:636
+msgid "Missing right parenthesis"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:639
 msgid "Missing operator for NOT"
-msgstr "Отсутствуют параметры для \"ИЛИ\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681
+msgstr "Пропущен оператор для NOT"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:688
 msgid "Wrong number of parameters for tags operator."
 msgstr "Неверное количество параметров оператора tags."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:690
 #, java-format
 msgid ""
@@ -2722,9 +2748,9 @@
 "выходящее за пределы допустимого диапазона, например: tags:1 или tags:2-5"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:700
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Неверное число параметров для оператора точек."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 #, java-format
 msgid ""
@@ -2735,42 +2761,18 @@
 "или диапазон, например, точки:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
 msgstr "Неверное значение id оператора: {0}. Ожидалось число."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:715
+#, java-format
 msgid "Incorrect value of changeset operator: {0}. Number is expected."
-msgstr "Неверное значение id оператора: {0}. Ожидалось число."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34
-msgid "Load Selection"
-msgstr "Загрузить выделенное"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
-#, java-format
-msgid "Contact {0}..."
-msgstr "Связаться с {0}..."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47
-msgid "Downloading..."
-msgstr "Скачивание..."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:63
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:80
-#, java-format
-msgid "Could not read from URL: \"{0}\""
-msgstr "Ошибка соединения с адресом: \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:83
-#, java-format
-msgid "Parsing error in URL: \"{0}\""
-msgstr "Ошибка разбора ссылки: \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:87
-msgid "Error while communicating with server."
-msgstr "Ошибка  связи с сервером."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:722
+#, java-format
+msgid "Incorrect value of version operator: {0}. Number is expected."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58
@@ -2918,5 +2920,5 @@
 msgstr "Установить {0}={1} для {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
 #, java-format
 msgid "Change relation member role for {0} {1}"
@@ -2933,5 +2935,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111
 msgid "Double conflict"
 msgstr "Двойной конфликт"
@@ -3020,5 +3022,5 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:436
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -3042,15 +3044,15 @@
 #, java-format
 msgid "Set the 'modified' flag for node {0}"
-msgstr ""
+msgstr "Установить флаг 'modified' для узла {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42
 #, java-format
 msgid "Set the 'modified' flag for way {0}"
-msgstr ""
+msgstr "Установить флаг 'modified' для пути {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43
 #, java-format
 msgid "Set the 'modified' flag for relation {0}"
-msgstr ""
+msgstr "Установить флаг 'modified' для отношения связи {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121
@@ -3091,19 +3093,4 @@
 msgstr "Устранить конфликты в списке участников отношения {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69
-#, java-format
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Удалить точку ''{0}'' в позиции {1} из отношения ''{2}''"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70
-#, java-format
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Удалить линию ''{0}'' в позиции {1} из отношения ''{2}''"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71
-#, java-format
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Удалить отношение ''{0}'' в позиции {1} из отношения ''{2}''"
-
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141
 #, java-format
@@ -3167,5 +3154,5 @@
 msgstr "Применить?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3204,60 +3191,72 @@
 msgstr "Новое значение"
 
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 msgid "Apply selected changes"
 msgstr "Применить выбранные изменения"
 
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 msgid "Don't apply changes"
 msgstr "Не применять изменения"
 
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:85
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:66
 msgid "Please select which property changes you want to apply."
 msgstr "Пожалуйста, выберите, какие параметры нужно изменить."
 
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:78
 msgid "Properties of "
 msgstr "Параметры "
 
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:123
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:104
 msgid "Roles in relations referring to"
 msgstr "Роли в отношениях, относящихся к"
 
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
 msgid "Automatic tag correction"
 msgstr "Автоматически исправлять теги"
 
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:53
 #, java-format
 msgid "Expected array of length 4, got {0}"
 msgstr "Ожидаемая длина массива 4, получено {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:63
 #, java-format
 msgid "Exactly four doubles excpected in string, got {0}"
 msgstr "Только четыре дубля ожидалось в строке, получено {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:68
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
 #, java-format
 msgid "Illegal double value ''{0}''"
 msgstr "Неверное значение дубля ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:101
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:103
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:73
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:77
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:79
+#, java-format
+msgid "Illegal latitude value ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:75
+#, java-format
+msgid "Illegal longitude value ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:111
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:113
 #, java-format
 msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
 msgstr "Ожидался параметр ''{0}'' > 0.0, получено {1}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Ошибка: не удается сохранить свойства для ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Ошибка в файле конфигурации на строках {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid ""
@@ -3268,5 +3267,5 @@
 "не является каталогом."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
 #, java-format
 msgid ""
@@ -3277,5 +3276,5 @@
 "является каталогом.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
 #, java-format
 msgid ""
@@ -3286,5 +3285,5 @@
 "отсутствующий каталог параметров: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -3295,5 +3294,5 @@
 "каталог параметров: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
 #, java-format
 msgid ""
@@ -3303,5 +3302,5 @@
 "параметрами по умолчанию."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
 #, java-format
 msgid ""
@@ -3312,5 +3311,5 @@
 "параметров по умолчанию."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
 #, java-format
 msgid ""
@@ -3321,5 +3320,5 @@
 "параметров к состоянию по умолчанию: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
 #, java-format
 msgid ""
@@ -3330,5 +3329,5 @@
 "резервный<br>{0}<br> а новый будет создан с параметрами по умолчанию.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #, java-format
 msgid ""
@@ -3339,10 +3338,10 @@
 "параметров {0} к состоянию по умолчанию."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "Ошибка: Неожиданная строка ''{0}'' в файле закладок ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
 #, java-format
 msgid ""
@@ -3431,24 +3430,24 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:85
 msgid "S"
 msgstr "Ю"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
 msgid "N"
 msgstr "С"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:99
 msgid "W"
 msgstr "З"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
 msgid "E"
 msgstr "В"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:207
 #, java-format
 msgid ""
@@ -3457,5 +3456,5 @@
 "Невозможно добавить примитив {0} к набору данных, так как он уже присутствует"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
 #, java-format
 msgid ""
@@ -3561,29 +3560,29 @@
 msgstr "В"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:264
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr "обнаружен id >= 0. Получено {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:401
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr "Элемент с id=0 не может быть невидимым"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:458
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "обнаружено id > 0. Получено {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "обнаружена версия > 0. Получено {0}"
 
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:652
+#, java-format
+msgid "Parameter ''{0}'' >= 0 expected, got {1}"
+msgstr "Ожидается что ''{0}'' >= 0, а получено {1}"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654
-#, fuzzy, java-format
-msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-msgstr "Ожидался параметр ''{0}'' > 0, получено {1}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
 #, java-format
 msgid ""
@@ -3591,6 +3590,8 @@
 "{0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029
+"Невозможно связать changesetId > 0 с новым примитивом. Заданное значение "
+"changesetId - {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1040
 msgid ""
 "Can''t merge because either of the participating primitives is new and the "
@@ -3600,5 +3601,5 @@
 "другой нет"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1042
 #, java-format
 msgid ""
@@ -3648,13 +3649,13 @@
 msgstr "параметр ''{0}'' должен быть в интервале 0..{1}, текущее значение {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:33
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:58
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:88
 #, java-format
 msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr "требуется параметр ''{0}'' > 0. Получен {1}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:115
 #, java-format
 msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
@@ -3667,72 +3668,72 @@
 msgstr "параметр {0} не в интервале 0..{1}, текущее значение {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:187
 msgid "Area style way is not closed."
 msgstr "Линия, обозначающая границу области, не замкнута."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:288
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "область с вложениями ''{0}'' не замкнута"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:359
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:674
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "В отношении «{0}» имеется участник, который был удален."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:370
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:682
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Линия «{0}» имеет меньше двух точек."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:375
 msgid "More than one \"from\" way found."
 msgstr "Обнаружена больше чем одна линия \"от\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:381
 msgid "More than one \"to\" way found."
 msgstr "Обнаружено больше одной линии \"до\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:387
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:401
 msgid "More than one \"via\" found."
 msgstr "Найдено больше одного \"via\" (через)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:392
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:406
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Неизвестная роль «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:409
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Неизвестный тип участника для «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:415
 msgid "No \"from\" way found."
 msgstr "Не найдена линия \"от\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:419
 msgid "No \"to\" way found."
 msgstr "Не найдена линия \"до\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:423
 msgid "No \"via\" node or way found."
 msgstr "Не найдена точка или линия \"via\" (через)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:432
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 "Линия \"from\" (от) не начинается или заканчивается на точке \"via\" (через)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:436
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 "Линия \"to\" (до) не начинается и не заканчивается на точке \"via\" (через)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:464
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
@@ -3740,40 +3741,40 @@
 "\" (через)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:468
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 "Линия \"to\" (до) не начинается и не заканчивается на линии \"via\" (через)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:562
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Стиль для ограничения {0} не найден."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:643
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Персечение между линиями ''{0}'' и ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:655
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Внутренняя линия «{0}» находится снаружи."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:690
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Нет полезной роли ''{0}'' для пути ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:703
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "не-линия ''{0}'' области с вложениями"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:749
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Для области с вложениями «{0}» отсутствует внешняя линия."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:809
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
@@ -3781,15 +3782,15 @@
 "Стиль для внутренней линии ''{0}'' такой же, как у области с вложениями."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:837
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Стиль для внешней линии ''{0}'' отсутствует."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1035
 #, java-format
 msgid "Error: {0}"
 msgstr "Ошибка: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1035
 #, java-format
 msgid "Warning: {0}"
@@ -3805,5 +3806,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
@@ -3825,5 +3826,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3846,5 +3848,5 @@
 #. darker blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "background"
@@ -3927,17 +3929,17 @@
 msgstr "Проекция Меркатора"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Польша)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:100
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:106
 msgid "PUWG Zone"
 msgstr "Зона PUWG"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:160
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Польша))"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:213
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -3989,8 +3991,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:199
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39
-msgid "Do not show again"
-msgstr "Больше не показывать"
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
+msgid "Do not show again (remembers choice)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3998,30 +4001,35 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
 msgid "incomplete"
 msgstr "неполный"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
 msgid "highway"
 msgstr "дорога"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
 #: build/trans_presets.java:3189
 msgid "railway"
 msgstr "железная дорога"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
 msgid "waterway"
 msgstr "водоём"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
 msgid "landuse"
 msgstr "землепользование"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
@@ -4033,5 +4041,6 @@
 msgstr[2] "{0} точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
 #, java-format
 msgid "{0} member"
@@ -4041,5 +4050,5 @@
 msgstr[2] "{0} участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -4076,6 +4085,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
 msgid "Conflict"
 msgstr "Конфликт"
@@ -4089,5 +4098,5 @@
 msgstr "Объект удалён"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:481
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
@@ -4108,4 +4117,10 @@
 msgstr "Нажмите, чтобы закрыть диалог"
 
+#: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:84
+#: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:102
+#, java-format
+msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
@@ -4183,65 +4198,65 @@
 msgstr "Пароль"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "usage"
 msgstr "использование"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options"
 msgstr "опции"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Show this help"
 msgstr "Показать эту справку"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid "Standard unix geometry argument"
 msgstr "Стандартный параметр геометрии unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
 msgid "Download the bounding box"
 msgstr "Скачать область в пределах рамки"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Скачать область по ссылке (с параметрами lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Открыть файл (как данные GPS, если .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
 msgid "Download the bounding box as raw gps"
 msgstr "Скачать область в пределах рамки, как данные GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
 msgid "Select with the given search"
 msgstr "Выбор с учетом поиска"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
 msgid "Launch in maximized mode"
 msgstr "Запуск в развернутом виде"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
 msgid "Reset the preferences to default"
 msgstr "Восстановить параметры по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
 msgid "Set the language."
 msgstr "Установить язык."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
 msgid "options provided as Java system properties"
 msgstr "системные настройки Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid "Change the folder for all user settings"
 msgstr "Сменить папку для всех настроек пользователя"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4253,9 +4268,9 @@
 "      настройки Java для увеличения максимально размера используемой памяти"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "examples"
 msgstr "примеры"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4265,25 +4280,25 @@
 "убедитесь, что загружаете данные перед --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Вместо --download=<bbox> можно указать osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
 msgid "Activating updated plugins"
 msgstr "Включение обновлённых модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Loading early plugins"
 msgstr "Загрузка ранних модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
 msgid "Setting defaults"
 msgstr "Настройки по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
 msgid "Loading plugins"
 msgstr "Загрузка модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4292,11 +4307,11 @@
 "используется."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
 msgid "File"
 msgstr "Файл"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4307,23 +4322,23 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
 msgid "Edit"
 msgstr "Правка"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166
 msgid "View"
 msgstr "Вид"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24
 msgid "Tools"
 msgstr "Инструменты"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:168
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Шаблоны"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:193
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4334,5 +4349,5 @@
 msgstr "Меню: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:301
 msgid "Audio"
 msgstr "Аудио"
@@ -4413,14 +4428,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
 msgid "User:"
 msgstr "Пользователь:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:371
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
 msgid "Layer not in list."
 msgstr "слоя нет в списке."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4508,5 +4523,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:475
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4550,4 +4565,5 @@
 #: ../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/dialogs/changeset/ChangesetCacheManager.java:178
 msgid "Properties"
 msgstr "Параметры"
@@ -4555,4 +4571,5 @@
 #: ../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/changeset/ChangesetCacheManager.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
@@ -5036,5 +5053,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
 msgid "No, abort"
 msgstr "Нет, прервать"
@@ -5119,6 +5136,6 @@
 #: ../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/properties/PropertiesDialog.java:184
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -5132,6 +5149,6 @@
 #: ../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/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5191,36 +5208,36 @@
 msgstr "Их набор данных не содержит тег с ключом {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:131
 msgid "Conflicts when combining primitives"
 msgstr "Конфликты при объединении элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:135
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr "Возникли конфликты при объединении линий - полученная линия: ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:140
 #, java-format
 msgid "Conflicts when merging nodes - target node is ''{0}''"
 msgstr "Возникли конфликты при объединении точек - полученная точка ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:282
 msgid "No conflicts to resolve"
 msgstr "Конфликтов не обнаружено"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344
 #: ../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:363
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359
 #: ../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:364
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../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:1094
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
 msgid "Apply"
 msgstr "Применить"
@@ -5322,5 +5339,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
@@ -5333,5 +5350,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
@@ -5412,30 +5429,22 @@
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
-"whether your want to <strong>keep</strong> these memberships for the "
-"combined way or whether you want to <strong>remove</strong> them.<br>The "
-"default is to <strong>keep</strong> them: the combined way will take the "
+"whether you want to <strong>keep</strong> these memberships for the combined "
+"way or whether you want to <strong>remove</strong> them.<br>The default is "
+"to <strong>keep</strong> the first way and <strong>remove</strong> the other "
+"ways that are members of the same relation: the combined way will take the "
 "place of the original way in the membership.</html>"
 msgstr ""
-"<html>Комбинированные линии являются участниками одного или более отношений. "
-"Пожалуйста решите, хотите ли вы <strong>сохранить</strong> этих участников "
-"для комбинированной линии или вы хотите <strong>удалить</strong> их.<br>По "
-"умолчанию они будут <strong>сохранены</strong>: комбинированная линия будет "
-"на месте оригинальной линии отношения.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
-"whether your want to <strong>keep</strong> these memberships for the target "
+"whether you want to <strong>keep</strong> these memberships for the target "
 "node or whether you want to <strong>remove</strong> them.<br>The default is "
-"to <strong>keep</strong> them: the target node will take the place of the "
-"original node in the membership.</html>"
-msgstr ""
-"<html>Объединённые точки являются членами одного или более отношений. "
-"Пожалуйста решите, хотите ли вы  <strong>сохранить</strong> этих участников "
-"для полученной точки или вы хотите <strong>удалить</strong> их.<br>По "
-"умолчанию, они будут <strong>сохранены</strong>: полученная точка будет на "
-"месте оригинальной точки отношения.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
+"to <strong>keep</strong> the first node and <strong>remove</strong> the "
+"other nodes that are members of the same relation: the target node will take "
+"the place of the original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
 msgid "Apply this role to all members"
 msgstr "Назначить эту роль всем участникам"
@@ -5458,11 +5467,9 @@
 msgstr "Показать только теги с конфликтами"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:168
 msgid "For selected objects only"
-msgstr "Удалить выделенные объекты."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131
-#, fuzzy
+msgstr "Только для выбранных объектов"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:169
 msgid ""
 "<html>Select to show changesets for the currently selected objects only."
@@ -5470,24 +5477,19 @@
 "html>"
 msgstr ""
-"<html>Пометьте, чтобы скачать данные в новый слой данных.<br>Снимите "
-"пометку, чтобы скачать данные с сервера в текущий активный слой.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 msgid "Changesets"
-msgstr "Пакет правок"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:262
 msgid "Open the list of changesets in the current layer."
-msgstr "Приблизиться к этой точке в текущем слое"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:307
 msgid "Select all objects assigned to the currently selected changesets"
-msgstr "Закрыть открытый пакет правок, выбранный в настоящий момент"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:366
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389
@@ -5495,23 +5497,28 @@
 msgstr "Скачать"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:367
 msgid "Download information about the selected changesets from the OSM server"
-msgstr "Скачать картографические данные с сервера OSM."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:402
 msgid "Closes the selected open changesets"
-msgstr "Закрыть выбранные открытые пакеты правок"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:433
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:176
 msgid "Show info"
 msgstr "Показать информацию"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:434
 msgid "Open a web page for each selected changeset"
-msgstr "Открыть редактор для выбранного отношения"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:473
+msgid "Details"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:474
+msgid "Opens the Changeset Manager window for the selected changesets"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -5526,12 +5533,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:442
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5539,5 +5546,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
 #, java-format
 msgid "Toggle: {0}"
@@ -5549,13 +5556,13 @@
 msgstr "Стек команд: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
 msgid "Resolve conflicts."
 msgstr "Устранить конфликты."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333
 msgid "Resolve"
 msgstr "Устранить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:334
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -5563,7 +5570,7 @@
 "объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:354
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
@@ -5624,5 +5631,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
@@ -5631,5 +5638,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -5676,18 +5683,18 @@
 msgstr "Режим фильтра"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133
 msgid "History"
 msgstr "Журнал"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 msgid "Display the history of all selected items."
 msgstr "Отобразить журнал по всем выделенным объектам."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:245
 msgid "Object with history"
 msgstr "Объект с историей"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:262
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142
@@ -5697,59 +5704,59 @@
 msgstr "Обновить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:263
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Скачать заново все выделенные объекты, и обновить список."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:302
 msgid "Show"
 msgstr "Показать"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303
 msgid "Display the history of the selected objects."
 msgstr "Показать историю выделенных объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr "Диалог ещё не создан. Сначала используйте createInstance()"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Layers"
 msgstr "Слои"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 msgid "Open a list of all loaded layers."
 msgstr "Показать список всех загруженных слоёв."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270
-msgid "Delete the selected layer."
-msgstr "Удалить выделенный слой."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:254
+msgid "Delete the selected layers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 msgid "Show/Hide"
 msgstr "Показать/скрыть"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
 msgid "Toggle visible state of the selected layer."
 msgstr "Показать/скрыть выделенный слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "Включить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:369
 msgid "Activate the selected layer"
 msgstr "Активировать выделенный слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:434
 msgid "Merge this layer into another layer"
 msgstr "Объединить этот слой с другим слоем"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:536
 msgid "Move the selected layer one row up."
 msgstr "Переместить выделенный слой вверх."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:555
 msgid "Move the selected layer one row down."
 msgstr "Переместить выделенный слой вниз."
@@ -5761,80 +5768,80 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 msgid "Open a list of all relations."
 msgstr "Показать список всех отношений."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
 #, java-format
 msgid "Relations: {0}"
 msgstr "Отношения: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
 msgid "Open an editor for the selected relation"
 msgstr "Открыть редактор для выбранного отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
 msgid "Delete the selected relation"
 msgstr "Удалить выбранное отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
 msgid "Create a new relation"
 msgstr "Создать новое отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Создать копию этого отношения и открыть его в другом окне редактора"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
 msgid "Set the current selection to the list of selected relations"
 msgstr "Установить текущий выбор на списке выделенных отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
 msgid "Select the members of all selected relations"
 msgstr "Выделите участников всех выбранных отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
 msgid "Select members"
 msgstr "Выбрать участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
 msgid "Download all members of the selected relations"
 msgstr "Скачать с сервера всех участников выделенных отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download members"
 msgstr "Скачать участников"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Current Selection"
 msgstr "Текущее выделение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
 msgid "Open a selection list window."
 msgstr "Показать окно со списком выделенных объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
 msgid "Zoom to selected element(s)"
 msgstr "Приблизиться к выделенным элементам"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
 msgid "Zoom to selection"
 msgstr "Приблизиться к выделенному"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:293
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Яч.: Связ.:{0} / Линий:{1} / Точек:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:295
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5842,14 +5849,14 @@
 msgstr "выделение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:347
 #, java-format
 msgid "Selection: {0}"
 msgstr "Выбор: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:347
 msgid "Undock the panel"
 msgstr "Отсоединить панель"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:361
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5858,19 +5865,19 @@
 "панели."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:372
 msgid "Click to minimize/maximize the panel content"
 msgstr "Щёлкните для уменьшения/увеличения содержимого панели"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:65
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139
 msgid "Authors"
 msgstr "Авторы"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:65
 msgid "Open a list of people working on the selected objects."
 msgstr "Показать список людей, работающих с выделенными объектами."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:137
 #, java-format
 msgid "{0} Author"
@@ -5880,13 +5887,13 @@
 msgstr[2] "{0} Авторов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:146
 msgid "Select primitives submitted by this user"
 msgstr "Выбрать элементы, созданные этим пользователем"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:177
 msgid "Launches a browser with information about the user"
 msgstr "Открыть в браузере информацию о пользователе"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:189
 #, java-format
 msgid ""
@@ -5896,815 +5903,264 @@
 "пользователей"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:212
+#, java-format
+msgid ""
+"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
+"this system.</html>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214
-#, java-format
-msgid ""
-"<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
-"missing on this system.</html>"
-msgstr ""
-"<html>Не удаётся создать ссылку URL, потому что кодировка "
-"''{0}''<br>отсутствует в этой системе.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216
 msgid "Missing encoding"
 msgstr "Отсутствует кодировка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:276
 msgid "Author"
 msgstr "Автор"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:276
 msgid "# Objects"
 msgstr "кол-во объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36
-#, fuzzy, java-format
-msgid "{0} [incomplete]"
-msgstr "неполный"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
-msgid "open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
-#, fuzzy
-msgid "closed"
-msgstr "замкнутая линия"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31
-#, fuzzy
-msgid "Download changesets"
-msgstr "Скачивание пакетов правок..."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
-#, 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/properties/PropertiesDialog.java:171
-msgid "An empty value deletes the tag."
-msgstr "Пустое значение удаляет тег."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
-msgid "<different>"
-msgstr "<различные>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
-msgid "Change values?"
-msgstr "Изменить значения?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Изменить параметры {0} объекта"
-msgstr[1] "Изменить параметры {0} объектов"
-msgstr[2] "Изменить параметры {0} объектов"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
-#, java-format
-msgid "This will change up to {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/properties/PropertiesDialog.java:329
-msgid "Please select a key"
-msgstr "Пожалуйста, выберите ключ"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342
-msgid "Please select a value"
-msgstr "Выберите значение"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432
-msgid "Please select the objects you want to change properties for."
-msgstr "Выберите объекты, для которых вы желаете изменить параметры."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439
-msgid "Properties/Memberships"
-msgstr "Параметры/Участники"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438
-msgid "Properties for selected objects."
-msgstr "Параметры выделенных объектов."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472
-msgid "Member Of"
-msgstr "Член группы"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547
-msgid "Add Properties"
-msgstr "Добавить параметры"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Свойств: {0} / Участников: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776
-msgid "Properties / Memberships"
-msgstr "Параметры / Участники"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
-msgid "Change relation"
-msgstr "Изменить отношение"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
-msgid "Delete from relation"
-msgstr "Удалить из отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Вы действительно хотите удалить отмеченное из отношения {0}?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833
-msgid "Delete the selected key in all objects"
-msgstr "Удалить выделенный ключ из всех объектов"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835
-msgid "Delete Properties"
-msgstr "Удалить параметры"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
-msgid "Add a new key/value pair to all objects"
-msgstr "Добавить новую пару ключ/значение для всех объектов"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878
-msgid "Edit the value of the selected key for all objects"
-msgstr "Изменить значение выбранного ключа для всех объектов"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
-msgid "Edit the relation the currently selected relation member refers to."
-msgstr ""
-"Редактировать отношение, к которому относится выделенный в настоящий момент "
-"участник."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220
-msgid "Download all child relations (recursively)"
-msgstr "Скачать все дочерние элементы (рекурсивно)"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
-msgid "Download All Children"
-msgstr "Скачать все дочерние элементы"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:241
-msgid "Download selected relations"
-msgstr "Скачать выбранные отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:245
-msgid "Download Selected Children"
-msgstr "Скачать дочерние элементы для выбранного"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:290
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:41
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:49
-msgid "Download relation members"
-msgstr "Скачать участников отношений"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482
-msgid "Conflicts in data"
-msgstr "Конфликт в данных"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:342
-#, java-format
-msgid ""
-"<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
-"loaded"
-msgstr ""
-"<html>Дочерний элемент<br>{0}<br>удален с сервера. Он не может быть загружен"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:351
-msgid "Relation is deleted"
-msgstr "Отношение удалено"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:408
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:517
-#, java-format
-msgid "Downloading relation {0}"
-msgstr "Скачивание отношения {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:427
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
-#, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Предупреждение: игнорирование исключения, потому что задание отменено. "
-"Исключение: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85
-#, java-format
-msgid "Downloading {0} incomplete child of relation ''{1}''"
-msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:179
+msgid "Display the basic properties of the changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:181
+msgid "Display the tags of the changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:182
+msgid "Content"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:183
+msgid "Display the objects created, updated, and deleted by the changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:125
+msgid "Close the dialog"
+msgstr "Закрыть диалог"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:163
+msgid "Query"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:358
+msgid "Launch the dialog for querying changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:265
+msgid "Remove from cache"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:383
+msgid "Remove the selected changesets from the local cache"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:410
+msgid "Close the selected changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:323
+msgid "Update changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:450
+msgid "Updates the selected changesets with current data from the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:475
+msgid "Download changeset content"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:477
+msgid "Download the content of the selected changesets from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:510
+msgid "My changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:512
+msgid "Download my changesets from the OSM server (max. 100 changesets)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:518
+msgid ""
+"<html>JOSM is currently running with an anonymous user. It can't "
+"download<br>your changesets from the OSM server unless you enter your OSM "
+"user name<br>in the JOSM preferences.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:51
+msgctxt "changeset.upload-comment"
+msgid "empty"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:62
+msgctxt "changeset.open"
+msgid "Open"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:64
+msgctxt "changeset.open"
+msgid "Closed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:221
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
+msgid "anonymous"
+msgstr "анонимный"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:30
+msgid "Comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38
+msgid "Open"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
+msgid "User"
+msgstr "Пользователь"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:54
+msgid "Created at"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:62
+msgid "Closed at"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:109
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:178
+msgid "Downloading changeset content"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:70
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:96
+#, java-format
+msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:169
+#, java-format
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:176
+#, java-format
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:306
+msgid "Download content"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:308
+msgid "Download the changeset content from the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:310
+msgid "Update content"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:312
+msgid "Update the changeset content from the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:248
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241
+msgid "Show history"
+msgstr "Показать историю"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250
+msgid "Download and show the history of the selected primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:356
+msgid "Select in layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:317
+msgid "Select the corresponding primitives in the current data layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:324
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:386
+#, java-format
+msgid ""
+"<html>The selected object isn''t available in the current<br>edit layer "
+"''{0}''.</html>"
+msgid_plural ""
+"<html>None of the selected objects is available in the current<br>edit layer "
+"''{0}''.</html>"
 msgstr[0] ""
-"Скачивание с сервера {0} неполный дочерний элемент отношения ''{1}''"
 msgstr[1] ""
-"Скачивание с сервера {0} неполных дочерних элементов отношения ''{1}''"
-msgstr[2] ""
-"Скачивание с сервера {0} неполных дочерних элементов отношения ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
-msgid "Download relations"
-msgstr "Скачивание отношений с сервера"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
-msgstr "({0}/{1}: Скачивание отношения ''{2}''..."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
-msgid "Tags and Members"
-msgstr "Теги и участники"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
-msgid "Parent Relations"
-msgstr "Родительские отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151
-msgid "Child Relations"
-msgstr "Дочерние элементы отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
-msgid "Apply Role:"
-msgstr "Применить роль:"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
-msgid "Enter a role and apply it to the selected relation members"
-msgstr "Ввести роль и применить её на выделенных участников отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567
-msgid ""
-"<html>There is at least one member in this relation referring<br>to the "
-"relation itself.<br>This creates circular dependencies and is discouraged."
-"<br>How do you want to proceed with circular dependencies?</html>"
-msgstr ""
-"<html>Имеется, по крайней мере, один участник отношения,<br>обращающийся к "
-"себе.<br>Это создаёт циклические отношения и потому не рекомендуется.<br>Вы "
-"хотите продолжать с циклическими отношениями?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575
-msgid "Remove them, clean up relation"
-msgstr "Удалить их, почистить отношение"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574
-msgid "Ignore them, leave relation as is"
-msgstr "Игнорировать их, оставить отношение как есть"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597
-#, java-format
-msgid ""
-"<html>This relation already has one or more members referring to<br>the "
-"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
-"html>"
-msgstr ""
-"<html>В этом отношение уже есть один или более участник, относящихся "
-"к<br>элементу ''{0}''<br><br>Вы действительно хотите добавить другого "
-"участника отношения?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607
-msgid "Multiple members referring to same primitive"
-msgstr "Несколько участников, относящихся к одному и тому же элементу"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625
-#, java-format
-msgid ""
-"<html>You are trying to add a relation to itself.<br><br>This creates "
-"circular references and is therefore discouraged.<br>Skipping relation "
-"''{0}''.</html>"
-msgstr ""
-"<html>Вы попытались создать отношение, ссылающееся на себя.<br><br>Это "
-"приводит к циклическим ссылкам и, поэтому не рекомендуется.<br>Отношение "
-"''{0}'' будет пропущено.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666
-msgid ""
-"Add all primitives selected in the current dataset before the first member"
-msgstr ""
-"Добавить все элементы, выделенные в текущем наборе данных, перед первым "
-"участником"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692
-msgid ""
-"Add all primitives selected in the current dataset after the last member"
-msgstr ""
-"Добавить все элементы, выделенные в текущем наборе данных, после последнего "
-"участника"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719
-msgid ""
-"Add all primitives selected in the current dataset before the first selected "
-"member"
-msgstr ""
-"Добавить все элементы, выделенные в текущем наборе данных, перед первым "
-"выделенным участником"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753
-msgid ""
-"Add all primitives selected in the current dataset after the last selected "
-"member"
-msgstr ""
-"Добавить все элементы, выделенные в текущем наборе данных, после последнего "
-"выделенного участника"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785
-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:788
-msgid "Relation Editor: Remove Selected"
-msgstr "Редактор отношений: удалить выделенное"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
-msgid ""
-"Select relation members which refer to primitives in the current selection"
-msgstr "Выделить участников отношения, которые относятся к выбранным элементам"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832
-#, java-format
-msgid ""
-"Select relation members which refer to {0} primitives in the current "
-"selection"
-msgstr ""
-"Выделить участников отношения, которые относятся к {0} элем. среди "
-"выделенных элементов"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
-msgid "Select primitives for selected relation members"
-msgstr "Выделить элементы для выделенных участников отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876
-msgid "Sort the relation members"
-msgstr "Сортировать участников отношений"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
-msgid "Sort"
-msgstr "Сортировать"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879
-msgid "Relation Editor: Sort"
-msgstr "Редактор отношений: сортировать"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899
-msgid "Move the currently selected members up"
-msgstr "Переместить выделенных участников отношения вверх"
-
-#. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902
-msgid "Relation Editor: Move Up"
-msgstr "Редактор отношений: поднять"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
-msgid "Move the currently selected members down"
-msgstr "Переместить выделенных участников отношения вниз"
-
-#. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921
-msgid "Relation Editor: Move Down"
-msgstr "Редактор отношений: опустить"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937
-msgid "Remove the currently selected members from this relation"
-msgstr "Удалить отмеченных участников из отношения"
-
-#. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
-msgid "Relation Editor: Remove"
-msgstr "Редактор отношений: удалить"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956
-msgid "Delete the currently edited relation"
-msgstr "Удалить редактируемое отношение"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
-msgid "Yes, create a conflict and close"
-msgstr "Да, создать конфликт и закрыть"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048
-msgid "Click to create a conflict and close this relation editor"
-msgstr "Щёлкните, чтобы создать конфликт и закрыть этот редактор отношений"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052
-msgid "No, continue editing"
-msgstr "Нет, продолжить редактирование"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
-msgid ""
-"Click to to return to the relation editor and to resume relation editing"
-msgstr ""
-"Щёлкните, чтобы вернуться в редактор отношений и продолжить редактирование "
-"отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061
-msgid ""
-"<html>This relation has been changed outside of the editor.<br>You can't "
-"apply your changes and continue editing.<br><br>Do you want to create a "
-"conflict and close the editor?</html>"
-msgstr ""
-"<html>Это отношение было изменено за пределами редактора.<br>Невозможно "
-"применить ваши изменения и продолжить редактирование.<br><br>Вы хотите "
-"создать конфликт и закрыть редактор?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
-msgid "Conflict in data"
-msgstr "Конфликт в данных"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078
-#, java-format
-msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
-msgstr ""
-"<html>В слое ''{0}'' уже есть конфликт для элемента<br>''{1}''."
-"<br>Пожалуйста, устраните этот конфликт, прежде чем продолжать.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
-msgid "Apply the current updates"
-msgstr "Записать внесённые изменения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
-msgid "Apply the updates and close the dialog"
-msgstr "Применить обновления и закрыть диалог"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-msgid "Cancel the updates and close the dialog"
-msgstr "Отменить обновления и закрыть диалог"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176
-msgid "Add an empty tag"
-msgstr "Добавить пустой тег"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
-msgid "Download all incomplete members"
-msgstr "Скачать всех неполных участников"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
-msgid "Download Members"
-msgstr "Скачать участников"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227
-msgid "Relation Editor: Download Members"
-msgstr "Редактор отношений: скачать участников"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
-msgid "Download selected incomplete members"
-msgstr "Скачать с сервера выделенных неполных участников"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
-msgid "Sets a role for the selected members"
-msgstr "Задать роль для выделенных участников"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265
-msgid "Apply Role"
-msgstr "Применить роль"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278
-#, java-format
-msgid ""
-"<html>You are setting an empty role on {0} primitives.<br>This is equal to "
-"deleting the roles of these primitives.<br>Do you really want to apply the "
-"new role?</html>"
-msgstr ""
-"<html>Вы назначили пустую роль на {0} элем .<br>Это эквивалентно удалению "
-"ролей из этих элементов.<br>Вы действительно хотите назначить новую роль?</"
-"html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
-msgid "Yes, apply it"
-msgstr "Да, записать"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
-msgid "No, don't apply"
-msgstr "Нет, не записывать"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289
-msgid "Confirm empty role"
-msgstr "Подтвердить пустую роль"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
-msgid "Edit the relation the currently selected relation member refers to"
-msgstr "Выделенный, при редактировании отношения, участник относится к"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
-msgid "Zoom to"
-msgstr "Задать масштаб"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221
-msgid "Zoom to the object the first selected member refers to"
-msgstr "Масштабирование приближает к первому выбранному объекту"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212
-msgid "Zooming disabled because layer of this relation is not active"
-msgstr "Масштабирование отменено, потому что слой этого отношения не активен"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217
-msgid "Zooming disabled because there is no selected member"
-msgstr "Масштабирование отменено, потому что вы не выбрали участника"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25
-msgid "Refers to"
-msgstr "Ссылается на"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
-msgid "Download referring relations"
-msgstr "Скачать ссылающиеся отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
-#, java-format
-msgid "Value of child.getId() > 0 expected. Got {1}."
-msgstr "Ожидалось значение child.getId() > 0. Получено {1}."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Предупреждение: Исключение проигнорировано, потому что задача отмнена. "
-"Исключение: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
-msgid "including immediate children of parent relations"
-msgstr "включая непосредственные дочерние элементы отношений"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93
-msgid "Load parent relations"
-msgstr "Скачать родителей отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
-msgid "Loading parent relations"
-msgstr "Скачивание родителей отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
-msgid "Edit the currently selected relation"
-msgstr "Изменить выбранное отношение"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
-msgid "Apply Changes"
-msgstr "Применить изменения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:133
-#, java-format
-msgid "Create new relation in layer ''{0}''"
-msgstr "Изменить новое отношение в слое ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:135
-#, java-format
-msgid "Edit new relation in layer ''{0}''"
-msgstr "Изменить новое отношение в слое ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:137
-#, java-format
-msgid "Edit relation #{0} in layer ''{1}''"
-msgstr "Изменить отношение #{0} в слое ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-msgid "Load relation"
-msgstr "Скачать отношение"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-msgid "Warning: ignoring exception because task was cancelled. Exception was: "
-msgstr ""
-"Предупреждение: исключение проигнорировано, потому что задача отмнена. "
-"Исключение было: "
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
-msgid "way is connected"
-msgstr "линия соединена"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
-msgid "way is connected to previous relation member"
-msgstr "линия соединена с предыдущим участником отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
-msgid "way is connected to next relation member"
-msgstr "линия соединена со следующим участником отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
-msgid "way is not connected to previous or next relation member"
-msgstr ""
-"линия не соединена ни с предыдущим, ни со следующим участником отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
-msgid "Bookmarks"
-msgstr "Закладки"
-
-#: ../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:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-"<html><strong>Текущая область для скачивания с сервера</strong> (minlat,"
-"minlon, maxlat, maxlon): {0}, {1}, {2}, {3}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
-msgid "Create bookmark"
-msgstr "Создать закладку"
-
-#: ../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:187
-msgid ""
-"Currently, there is no download area selected. Please select an area first."
-msgstr ""
-"В настоящий момент вы не указали область для скачивания. Пожалуйста выберите "
-"её."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
-msgid "Please enter a name for the bookmarked download area."
-msgstr ""
-"Пожалуйста, введите название закладки для скачиваемой с сервера области."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
-msgid "Name of location"
-msgstr "Название места"
-
-#: ../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:237
-msgid "Rename the currently selected bookmark"
-msgstr "Переименовать выделенные закладки"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
-msgid "min lat"
-msgstr "мин. широта"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
-msgid "min lon"
-msgstr "мин. долгота"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
-msgid "max lat"
-msgstr "макс. широта"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
-msgid "max lon"
-msgstr "макс. долгота"
-
-#: ../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 "
-"area)"
-msgstr ""
-"URL с www.openstreetmap.org (вы можете вставить URL сюда, чтобы скачать "
-"область)"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
-msgid "Bounding Box"
-msgstr "Рамка"
-
-#: ../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:223
-msgid "Value for latitude in range [-90,90] required."
-msgstr "Значение широты должно быть в пределах [-90,90]."
-
-#: ../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:294
-msgid "Paste URL from clipboard"
-msgstr "Вставьте ссылку из буфера"
-
-#. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-msgid "Data Sources and Types"
-msgstr "Источники и типы данных"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:95
-msgid "OpenStreetMap data"
-msgstr "Данные OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:96
-msgid "Select to download OSM data in the selected download area."
-msgstr "Пометьте, чтобы скачать с сервера данные OSM, для выделенной области."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:98
-msgid "Raw GPS data"
-msgstr "Данные GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:99
-msgid "Select to download GPS traces in the selected download area."
-msgstr "Пометьте, чтобы скачать с сервера треки GPS, для выделеной области."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
-msgid "Download as new layer"
-msgstr "Скачать как новый слой"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:120
-msgid ""
-"<html>Select to download data into a new data layer.<br>Unselect to download "
-"into the currently active data layer.</html>"
-msgstr ""
-"<html>Пометьте, чтобы скачать данные в новый слой данных.<br>Снимите "
-"пометку, чтобы скачать данные с сервера в текущий активный слой.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:124
-msgid "Download Area"
-msgstr "Область для скачивания"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
-msgid "No area selected yet"
-msgstr "Область ещё не выбрана"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:218
-msgid "Download area too large; will probably be rejected by server"
-msgstr ""
-"Область для скачивания слишком велика. Вероятно, сервер откажется обработать "
-"запрос."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:221
-msgid "Download area ok, size probably acceptable to server"
-msgstr "Область для скачивания приемлема по площади."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:374
-msgid "Click to close the dialog and to abort downloading"
-msgstr "Нажмите, чтобы закрыть диалог и прервать скачивание с сервера"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-msgid "Click do download the currently selected area"
-msgstr "Нажмите, чтобы скачать с сервера выделенную область"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398
-msgid "Please select a download area first."
-msgstr "Пожалуйста, выделите сначала область для скачивания с сервера."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:407
-#, java-format
-msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-msgstr ""
-"<html>Ни <strong>{0}</strong> ни <strong>{1}</strong> не назначено."
-"<br>Пожалуйста выберите, скачать только данные OSM с сервера, или только "
-"данные GPX, или и то и другое.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
-msgid "Enter a place name to search for:"
-msgstr "Название места для поиска:"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-msgid "Enter a place name to search for"
-msgstr "Введите название места для поиска"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
-msgid "Areas around places"
-msgstr "Области вокруг мест"
-
-#. SAXException does not chain correctly
-#: ../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:255
-msgid "Search ..."
-msgstr "Найти ..."
-
-#: ../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:296
-msgid "Querying name server"
-msgstr "Запрос на сервер имён"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324
-msgid "Querying name server ..."
-msgstr "Запрос на сервер имён ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:370
+msgid "Nothing to select"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:425
+msgid "Zoom to in layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379
+msgid "Zoom to the corresponding primitives in the current data layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:439
+msgid "Nothing to zoom to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+msgid "The content of this changeset is not downloaded yet."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+msgid "Download now"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+msgid "Download the changeset content"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:50
+msgid "Created"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:51
+msgid "Updated"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:52
+msgid "Deleted"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:32
+msgid "ID"
+msgstr ""
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -7441,7 +6897,8 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -7597,4 +7054,1200 @@
 msgstr "Название"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:115
+msgid "ID:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:128
+msgid "Comment:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:143
+msgid "Open/Closed:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:155
+msgid "Created by:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:168
+msgid "Created on:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:180
+msgid "Closed on:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:214
+msgctxt "changeset.state"
+msgid "Open"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:216
+msgctxt "changeset.state"
+msgid "Closed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:267
+msgid "Remove the changeset in the detail view panel from the local cache"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:325
+msgid "Update the changeset from the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:358
+msgid ""
+"Select the primitives in the content of this changeset in the current data "
+"layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:434
+#, java-format
+msgid ""
+"<html>None of the objects in the content of changeset {0} is available in "
+"the current<br>edit layer ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:427
+msgid ""
+"Zoom to the primitives in the content of this changeset in the current data "
+"layer"
+msgstr ""
+
+#. parent for dialog is Main.parent
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java:127
+msgid "Download changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36
+#, java-format
+msgid "{0} [incomplete]"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
+msgid "open"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
+msgid "closed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:45
+msgid "Changeset ID: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:47
+msgid "Enter a changset id"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:79
+msgid ""
+"Download the changeset with the specified id, including the changeset content"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:141
+msgid ""
+"The current value isn't a valid changeset ID. Please enter an integer value "
+"> 0"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+msgid "Please enter an integer value > 0"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+msgid "Select changesets owned by specific users"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+msgid "Select changesets depending on whether they are open or closed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+msgid ""
+"Select changesets based on the date/time they have been created or closed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+msgid "Select only changesets related to a specific bounding box"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+msgid "Query open changesets only"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+msgid "Query closed changesets only"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+msgid "Query both open and closed changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+msgid "User ID: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+msgid "User name: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+msgid "Only changesets owned by myself"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+msgid "Only changesets owned by the user with the following user ID"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+msgid ""
+"Can't restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#, java-format
+msgid "Current value ''{0}'' for user ID isn''t valid"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#, java-format
+msgid "Can''t restrict the changeset query to the user name ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+msgid "Please enter a valid user ID"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+msgid "Invalid user ID"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+msgid "Please enter a non-empty user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+msgid "Invalid user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+msgid "Date: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+msgid "Closed after - "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+msgid "Created before - "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+msgid "Only changesets closed after the following date/time"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+msgid ""
+"Can't build changeset query with time based restrictions. Input isn't valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+msgid "Invalid date/time values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+msgid ""
+"Can''t restrict the changeset query to a specific bounding box. The input is "
+"invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+msgid "Invalid bounding box"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+msgid ""
+"The current value isn't a valid user ID. Please enter an integer value > 0"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+msgid ""
+"<html>The  current value isn't a valid user name.<br>Please enter an non-"
+"empty user name.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+msgid "Please enter an non-empty user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#, java-format
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: {0}"
+"<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#, java-format
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108
+msgid "Download my changesets only"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:109
+msgid ""
+"<html>Select to restrict the query to your changsets only.<br>Unselect to "
+"include all changesets in the query.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:193
+#, java-format
+msgid ""
+"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
+"default query."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+msgid "Basic"
+msgstr "Основной"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
+msgid "Download changesets using a predefined queries"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:54
+msgid "From URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
+msgid "Query changesets according to an URL of the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+msgid "Advanced"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
+msgid "Query changesets according to advanced query parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:82
+msgid "Query changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:165
+msgid "Query and download changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:171
+msgid "Please enter a valid changeset query URL first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:172
+msgid "Illegal changeset query URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:209
+msgid "Close the dialog and abort querying of changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:71
+msgid "Querying and downloading changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:136
+msgid "Determine user id for current user..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:164
+msgid "Query and download changesets ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:42
+msgid "URL: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
+#, java-format
+msgid ""
+"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
+"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
+"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
+"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
+"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
+"changesets?open=true</a></li></ul>Note that changeset queries are currently "
+"always submitted to ''{0}'', regardless of the host, port and path of the "
+"URL entered beow.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+msgid "This changeset query URL is invalid"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#, 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/properties/PropertiesDialog.java:174
+msgid "An empty value deletes the tag."
+msgstr "Пустое значение удаляет тег."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+msgid "<different>"
+msgstr "<различные>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+msgid "Change values?"
+msgstr "Изменить значения?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Изменить параметры {0} объекта"
+msgstr[1] "Изменить параметры {0} объектов"
+msgstr[2] "Изменить параметры {0} объектов"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#, java-format
+msgid "This will change up to {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/properties/PropertiesDialog.java:332
+msgid "Please select a key"
+msgstr "Пожалуйста, выберите ключ"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+msgid "Please select a value"
+msgstr "Выберите значение"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:435
+msgid "Please select the objects you want to change properties for."
+msgstr "Выберите объекты, для которых вы желаете изменить параметры."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:442
+msgid "Properties/Memberships"
+msgstr "Параметры/Участники"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:441
+msgid "Properties for selected objects."
+msgstr "Параметры выделенных объектов."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:475
+msgid "Member Of"
+msgstr "Член группы"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:564
+msgid "Add Properties"
+msgstr "Добавить параметры"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Свойств: {0} / Участников: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+msgid "Properties / Memberships"
+msgstr "Параметры / Участники"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+msgid "Change relation"
+msgstr "Изменить отношение"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+msgid "Delete from relation"
+msgstr "Удалить из отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Вы действительно хотите удалить отмеченное из отношения {0}?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+msgid "Delete the selected key in all objects"
+msgstr "Удалить выделенный ключ из всех объектов"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+msgid "Delete Properties"
+msgstr "Удалить параметры"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+msgid "Add a new key/value pair to all objects"
+msgstr "Добавить новую пару ключ/значение для всех объектов"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+msgid "Edit the value of the selected key for all objects"
+msgstr "Изменить значение выбранного ключа для всех объектов"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
+#, fuzzy
+msgid "Select relation"
+msgstr "Удалить {0} отношение"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#, fuzzy
+msgid "Select relation in main selection."
+msgstr "Нет выделенного отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
+#, fuzzy
+msgid "Select in relation list"
+msgstr "Выбрать варианты отрисовки линий"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
+#, fuzzy
+msgid "Select relation in relation list."
+msgstr "Выбрать варианты отрисовки линий"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
+msgid "Edit the relation the currently selected relation member refers to."
+msgstr ""
+"Редактировать отношение, к которому относится выделенный в настоящий момент "
+"участник."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220
+msgid "Download all child relations (recursively)"
+msgstr "Скачать все дочерние элементы (рекурсивно)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
+msgid "Download All Children"
+msgstr "Скачать все дочерние элементы"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:241
+msgid "Download selected relations"
+msgstr "Скачать выбранные отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:245
+msgid "Download Selected Children"
+msgstr "Скачать дочерние элементы для выбранного"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:41
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:49
+msgid "Download relation members"
+msgstr "Скачать участников отношений"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482
+msgid "Conflicts in data"
+msgstr "Конфликт в данных"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:342
+#, java-format
+msgid ""
+"<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
+"loaded"
+msgstr ""
+"<html>Дочерний элемент<br>{0}<br>удален с сервера. Он не может быть загружен"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:351
+msgid "Relation is deleted"
+msgstr "Отношение удалено"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:408
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:517
+#, java-format
+msgid "Downloading relation {0}"
+msgstr "Скачивание отношения {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:427
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#, java-format
+msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgstr ""
+"Предупреждение: игнорирование исключения, потому что задание отменено. "
+"Исключение: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85
+#, java-format
+msgid "Downloading {0} incomplete child of relation ''{1}''"
+msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
+msgstr[0] ""
+"Скачивание с сервера {0} неполный дочерний элемент отношения ''{1}''"
+msgstr[1] ""
+"Скачивание с сервера {0} неполных дочерних элементов отношения ''{1}''"
+msgstr[2] ""
+"Скачивание с сервера {0} неполных дочерних элементов отношения ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+msgid "Download relations"
+msgstr "Скачивание отношений с сервера"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
+#, java-format
+msgid "({0}/{1}: Downloading relation ''{2}''..."
+msgstr "({0}/{1}: Скачивание отношения ''{2}''..."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
+msgid "Tags and Members"
+msgstr "Теги и участники"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+msgid "Parent Relations"
+msgstr "Родительские отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151
+msgid "Child Relations"
+msgstr "Дочерние элементы отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+msgid "Apply Role:"
+msgstr "Применить роль:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
+msgid "Enter a role and apply it to the selected relation members"
+msgstr "Ввести роль и применить её на выделенных участников отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571
+msgid ""
+"<html>There is at least one member in this relation referring<br>to the "
+"relation itself.<br>This creates circular dependencies and is discouraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
+msgstr ""
+"<html>Имеется, по крайней мере, один участник отношения,<br>обращающийся к "
+"себе.<br>Это создаёт циклические отношения и потому не рекомендуется.<br>Вы "
+"хотите продолжать с циклическими отношениями?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
+msgid "Remove them, clean up relation"
+msgstr "Удалить их, почистить отношение"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578
+msgid "Ignore them, leave relation as is"
+msgstr "Игнорировать их, оставить отношение как есть"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:601
+#, java-format
+msgid ""
+"<html>This relation already has one or more members referring to<br>the "
+"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
+"html>"
+msgstr ""
+"<html>В этом отношение уже есть один или более участник, относящихся "
+"к<br>элементу ''{0}''<br><br>Вы действительно хотите добавить другого "
+"участника отношения?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
+msgid "Multiple members referring to same primitive"
+msgstr "Несколько участников, относящихся к одному и тому же элементу"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629
+#, java-format
+msgid ""
+"<html>You are trying to add a relation to itself.<br><br>This creates "
+"circular references and is therefore discouraged.<br>Skipping relation "
+"''{0}''.</html>"
+msgstr ""
+"<html>Вы попытались создать отношение, ссылающееся на себя.<br><br>Это "
+"приводит к циклическим ссылкам и, поэтому не рекомендуется.<br>Отношение "
+"''{0}'' будет пропущено.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:670
+msgid ""
+"Add all primitives selected in the current dataset before the first member"
+msgstr ""
+"Добавить все элементы, выделенные в текущем наборе данных, перед первым "
+"участником"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:696
+msgid ""
+"Add all primitives selected in the current dataset after the last member"
+msgstr ""
+"Добавить все элементы, выделенные в текущем наборе данных, после последнего "
+"участника"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:723
+msgid ""
+"Add all primitives selected in the current dataset before the first selected "
+"member"
+msgstr ""
+"Добавить все элементы, выделенные в текущем наборе данных, перед первым "
+"выделенным участником"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:757
+msgid ""
+"Add all primitives selected in the current dataset after the last selected "
+"member"
+msgstr ""
+"Добавить все элементы, выделенные в текущем наборе данных, после последнего "
+"выделенного участника"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:789
+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:792
+msgid "Relation Editor: Remove Selected"
+msgstr "Редактор отношений: удалить выделенное"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:826
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr "Выделить участников отношения, которые относятся к выбранным элементам"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:836
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+"Выделить участников отношения, которые относятся к {0} элем. среди "
+"выделенных элементов"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:860
+msgid "Select primitives for selected relation members"
+msgstr "Выделить элементы для выделенных участников отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:880
+msgid "Sort the relation members"
+msgstr "Сортировать участников отношений"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:882
+msgid "Sort"
+msgstr "Сортировать"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
+msgid "Relation Editor: Sort"
+msgstr "Редактор отношений: сортировать"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903
+msgid "Reverse the order of the relation members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905
+msgid "Reverse"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
+msgid "Relation Editor: Reverse"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
+msgid "Move the currently selected members up"
+msgstr "Переместить выделенных участников отношения вверх"
+
+#. putValue(NAME, tr("Move Up"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+msgid "Relation Editor: Move Up"
+msgstr "Редактор отношений: поднять"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945
+msgid "Move the currently selected members down"
+msgstr "Переместить выделенных участников отношения вниз"
+
+#. putValue(NAME, tr("Move Down"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+msgid "Relation Editor: Move Down"
+msgstr "Редактор отношений: опустить"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+msgid "Remove the currently selected members from this relation"
+msgstr "Удалить отмеченных участников из отношения"
+
+#. putValue(NAME, tr("Remove"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+msgid "Relation Editor: Remove"
+msgstr "Редактор отношений: удалить"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:983
+msgid "Delete the currently edited relation"
+msgstr "Удалить редактируемое отношение"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
+msgid "Yes, create a conflict and close"
+msgstr "Да, создать конфликт и закрыть"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075
+msgid "Click to create a conflict and close this relation editor"
+msgstr "Щёлкните, чтобы создать конфликт и закрыть этот редактор отношений"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079
+msgid "No, continue editing"
+msgstr "Нет, продолжить редактирование"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081
+msgid ""
+"Click to to return to the relation editor and to resume relation editing"
+msgstr ""
+"Щёлкните, чтобы вернуться в редактор отношений и продолжить редактирование "
+"отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088
+msgid ""
+"<html>This relation has been changed outside of the editor.<br>You can't "
+"apply your changes and continue editing.<br><br>Do you want to create a "
+"conflict and close the editor?</html>"
+msgstr ""
+"<html>Это отношение было изменено за пределами редактора.<br>Невозможно "
+"применить ваши изменения и продолжить редактирование.<br><br>Вы хотите "
+"создать конфликт и закрыть редактор?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
+msgid "Conflict in data"
+msgstr "Конфликт в данных"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105
+#, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+"<br>Please resolve this conflict first, then try again.</html>"
+msgstr ""
+"<html>В слое ''{0}'' уже есть конфликт для элемента<br>''{1}''."
+"<br>Пожалуйста, устраните этот конфликт, прежде чем продолжать.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119
+msgid "Apply the current updates"
+msgstr "Записать внесённые изменения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
+msgid "Apply the updates and close the dialog"
+msgstr "Применить обновления и закрыть диалог"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186
+msgid "Cancel the updates and close the dialog"
+msgstr "Отменить обновления и закрыть диалог"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203
+msgid "Add an empty tag"
+msgstr "Добавить пустой тег"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216
+msgid "Download all incomplete members"
+msgstr "Скачать всех неполных участников"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253
+msgid "Download Members"
+msgstr "Скачать участников"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
+msgid "Relation Editor: Download Members"
+msgstr "Редактор отношений: скачать участников"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251
+msgid "Download selected incomplete members"
+msgstr "Скачать с сервера выделенных неполных участников"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+msgid "Sets a role for the selected members"
+msgstr "Задать роль для выделенных участников"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292
+msgid "Apply Role"
+msgstr "Применить роль"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305
+#, java-format
+msgid ""
+"<html>You are setting an empty role on {0} primitives.<br>This is equal to "
+"deleting the roles of these primitives.<br>Do you really want to apply the "
+"new role?</html>"
+msgstr ""
+"<html>Вы назначили пустую роль на {0} элем .<br>Это эквивалентно удалению "
+"ролей из этих элементов.<br>Вы действительно хотите назначить новую роль?</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
+msgid "Yes, apply it"
+msgstr "Да, записать"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+msgid "No, don't apply"
+msgstr "Нет, не записывать"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316
+msgid "Confirm empty role"
+msgstr "Подтвердить пустую роль"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1384
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr "Выделенный, при редактировании отношения, участник относится к"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
+msgid "Zoom to"
+msgstr "Задать масштаб"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221
+msgid "Zoom to the object the first selected member refers to"
+msgstr "Масштабирование приближает к первому выбранному объекту"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212
+msgid "Zooming disabled because layer of this relation is not active"
+msgstr "Масштабирование отменено, потому что слой этого отношения не активен"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217
+msgid "Zooming disabled because there is no selected member"
+msgstr "Масштабирование отменено, потому что вы не выбрали участника"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25
+msgid "Refers to"
+msgstr "Ссылается на"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
+msgid "Download referring relations"
+msgstr "Скачать ссылающиеся отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
+#, java-format
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr "Ожидалось значение child.getId() > 0. Получено {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+msgstr ""
+"Предупреждение: Исключение проигнорировано, потому что задача отмнена. "
+"Исключение: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+msgid "including immediate children of parent relations"
+msgstr "включая непосредственные дочерние элементы отношений"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93
+msgid "Load parent relations"
+msgstr "Скачать родителей отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
+msgid "Loading parent relations"
+msgstr "Скачивание родителей отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
+msgid "Edit the currently selected relation"
+msgstr "Изменить выбранное отношение"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
+msgid "Apply Changes"
+msgstr "Применить изменения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:133
+#, java-format
+msgid "Create new relation in layer ''{0}''"
+msgstr "Изменить новое отношение в слое ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:135
+#, java-format
+msgid "Edit new relation in layer ''{0}''"
+msgstr "Изменить новое отношение в слое ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:137
+#, java-format
+msgid "Edit relation #{0} in layer ''{1}''"
+msgstr "Изменить отношение #{0} в слое ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
+msgid "Load relation"
+msgstr "Скачать отношение"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
+msgid "Warning: ignoring exception because task was cancelled. Exception was: "
+msgstr ""
+"Предупреждение: исключение проигнорировано, потому что задача отмнена. "
+"Исключение было: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
+msgid "way is connected"
+msgstr "линия соединена"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
+msgid "way is connected to previous relation member"
+msgstr "линия соединена с предыдущим участником отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
+msgid "way is connected to next relation member"
+msgstr "линия соединена со следующим участником отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
+msgid "way is not connected to previous or next relation member"
+msgstr ""
+"линия не соединена ни с предыдущим, ни со следующим участником отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+msgid "Bookmarks"
+msgstr "Закладки"
+
+#: ../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:149
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+"<html><strong>Текущая область для скачивания с сервера</strong> (minlat,"
+"minlon, maxlat, maxlon): {0}, {1}, {2}, {3}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+msgid "Create bookmark"
+msgstr "Создать закладку"
+
+#: ../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:187
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+"В настоящий момент вы не указали область для скачивания. Пожалуйста выберите "
+"её."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+msgid "Please enter a name for the bookmarked download area."
+msgstr ""
+"Пожалуйста, введите название закладки для скачиваемой с сервера области."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+msgid "Name of location"
+msgstr "Название места"
+
+#: ../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:237
+msgid "Rename the currently selected bookmark"
+msgstr "Переименовать выделенные закладки"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+msgid "min lat"
+msgstr "мин. широта"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+msgid "min lon"
+msgstr "мин. долгота"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+msgid "max lat"
+msgstr "макс. широта"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+msgid "max lon"
+msgstr "макс. долгота"
+
+#: ../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 "
+"area)"
+msgstr ""
+"URL с www.openstreetmap.org (вы можете вставить URL сюда, чтобы скачать "
+"область)"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+msgid "Bounding Box"
+msgstr "Рамка"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr "Строка ''{0}'' не является правильным двойным значением."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
+msgid "Value for latitude in range [-90,90] required."
+msgstr "Значение широты должно быть в пределах [-90,90]."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
+msgid "Value for longitude in range [-180,180] required."
+msgstr "Значение долготы должно быть в пределах  [-180,180]."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
+msgid "Paste URL from clipboard"
+msgstr "Вставьте ссылку из буфера"
+
+#. adding the download tasks
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+msgid "Data Sources and Types"
+msgstr "Источники и типы данных"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:95
+msgid "OpenStreetMap data"
+msgstr "Данные OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:96
+msgid "Select to download OSM data in the selected download area."
+msgstr "Пометьте, чтобы скачать с сервера данные OSM, для выделенной области."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:98
+msgid "Raw GPS data"
+msgstr "Данные GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:99
+msgid "Select to download GPS traces in the selected download area."
+msgstr "Пометьте, чтобы скачать с сервера треки GPS, для выделеной области."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
+msgid "Download as new layer"
+msgstr "Скачать как новый слой"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:120
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+"<html>Пометьте, чтобы скачать данные в новый слой данных.<br>Снимите "
+"пометку, чтобы скачать данные с сервера в текущий активный слой.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:124
+msgid "Download Area"
+msgstr "Область для скачивания"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+msgid "No area selected yet"
+msgstr "Область ещё не выбрана"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:218
+msgid "Download area too large; will probably be rejected by server"
+msgstr ""
+"Область для скачивания слишком велика. Вероятно, сервер откажется обработать "
+"запрос."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:221
+msgid "Download area ok, size probably acceptable to server"
+msgstr "Область для скачивания приемлема по площади."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:374
+msgid "Click to close the dialog and to abort downloading"
+msgstr "Нажмите, чтобы закрыть диалог и прервать скачивание с сервера"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+msgid "Click do download the currently selected area"
+msgstr "Нажмите, чтобы скачать с сервера выделенную область"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398
+msgid "Please select a download area first."
+msgstr "Пожалуйста, выделите сначала область для скачивания с сервера."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:407
+#, java-format
+msgid ""
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
+"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+msgstr ""
+"<html>Ни <strong>{0}</strong> ни <strong>{1}</strong> не назначено."
+"<br>Пожалуйста выберите, скачать только данные OSM с сервера, или только "
+"данные GPX, или и то и другое.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+msgid "Class Type"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
+msgid "Bounds"
+msgstr "Границы"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+msgid "Near"
+msgstr "Возле"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+msgctxt "placeselection"
+msgid "Zoom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:101
+msgid "Choose the server for searching:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+msgid "Enter a place name to search for:"
+msgstr "Название места для поиска:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+msgid "Enter a place name to search for"
+msgstr "Введите название места для поиска"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:147
+msgid "Areas around places"
+msgstr "Области вокруг мест"
+
+#. SAXException does not chain correctly
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Пустой указатель исключение, возможно есть отсутствующие теги"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+msgid "Search ..."
+msgstr "Найти ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+msgid "Click to start searching for places"
+msgstr "Нажмите, чтобы начать поиск мест"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+msgid "Querying name server"
+msgstr "Запрос на сервер имён"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+msgid "Querying name server ..."
+msgstr "Запрос на сервер имён ..."
+
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -7615,5 +8268,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
 #: build/trans_presets.java:361 build/trans_presets.java:660
 #: build/trans_presets.java:800 build/trans_presets.java:1148
@@ -7625,311 +8278,11 @@
 msgstr "Тип"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408
-msgid "Near"
-msgstr "Возле"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-"<b>Масштабировать:</b> Крутите колёсико мыши, сделайте двойной щелчок или "
-"нажмите Ctrl + Вверх/Вниз <b>Двигать карту:</b> Удерживая правую кнопку "
-"мышки, двигайте мышку или используйте клавиши передвижения курсора. "
-"<b>Выбрать:</b> Удерживая левую кнопку мышки, нарисуйте рамку."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Интерактивная карта"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
-msgid "zoom level"
-msgstr "масштаб"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-msgid "x from"
-msgstr "x от"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
-msgid "to"
-msgstr "до"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "y from"
-msgstr "y от"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
-msgid "Tile Numbers"
-msgstr "Номера квадратов"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr "Не удалось прочитать файл CSS ''help-browser.css''. Исключение: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr "Браузер справки JOSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188
-#, java-format
-msgid ""
-"<html><p class=\"warning-header\">Help content for help topic missing</p><p "
-"class=\"warning-body\">Help content for the help topic <strong>{0}</strong> "
-"is not available yet. It is missing both in your local language ({1}) and in "
-"english.<br><br>Please help to improve the JOSM help system and fill in the "
-"missing information.You can both edit the <a href=\"{2}\">help topic in your "
-"local language ({1})</a> and the <a href=\"{3}\">help topic in english</a>.</"
-"p></html>"
-msgstr ""
-"<html><p class=\"warning-header\">Отсутствует содержимое справки в "
-"справочном разделе</p><p class=\"warning-body\">Содержимое справки в "
-"справочном разделе <strong>{0}</strong> пока ещё не доступно. Он ешё не "
-"написан ни на русском ({1}), ни на английском языке.<br><br>Пожалуйста, "
-"помогите улучшить справочную систему JOSM и допишите недостающую информацию. "
-"Вы можете отредактировать статью <a href=\"{2}\">help на русском ({1})</a> и "
-"статью <a href=\"{3}\">help на английском языке</a>.</p></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210
-#, java-format
-msgid ""
-"<html><p class=\"error-header\">Error when retrieving help information</p><p "
-"class=\"error-body\">The content for the help topic <strong>{0}</strong> "
-"could not be loaded. The error message is (untranslated):<br><tt>{1}</tt></"
-"p></html>"
-msgstr ""
-"<html><p class=\"error-header\">Произошла ошибка при получении справочной "
-"информации</p><p class=\"error-body\">Невозможно загрузить содержимое "
-"справочной статьи <strong>{0}</strong>. Сообщение об ошибке (не переведено):"
-"<br><tt>{1}</tt></p></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-"<html>Не удалось открыть справочную страницу по ссылке {0}.<br>Возможно в "
-"сети проблемы, поэтому проверьте<br>ваше интернет-соединение</html>"
-
-#: ../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: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:362
-msgid "Edit the current help page"
-msgstr "Править текущую страницу справки"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369
-#, java-format
-msgid ""
-"<html>The current URL <tt>{0}</tt><br>is an external URL. Editing is only "
-"possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
-msgstr ""
-"<html>Текущая ссылка <tt>{0}</tt><br>это внешняя ссылка. Только справочные "
-"статьи можно редактировать<br>на сервере справки<tt>{1}</tt>.</html>"
-
-#. putValue(NAME, tr("Reload"));
-#: ../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:407
-msgid "Go to the previous page"
-msgstr "Перейти на предыдущую страницу"
-
-#. putValue(NAME, tr("Forward"));
-#: ../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:443
-msgid "Go to the JOSM help home page"
-msgstr "Перейти на начальную страницу справки JOSM"
-
-#: ../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:524
-msgid "Failed to open help page. The target URL is empty."
-msgstr "Не удалось открыть справочную страницу. Ссылка пуста."
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525
-msgid "Failed to open help page"
-msgstr "Не удалось открыть справочную страницу"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-"Невозможно прочитать команду. Выход из браузера справки. Исключение было:"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr "Не удалось запустить внешний браузер справки"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr "Широта: "
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr "Долгота: "
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136
-msgid "Coordinates"
-msgstr "Координаты"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
-#, java-format
-msgid "History for node {0}"
-msgstr "История точки {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
-#, java-format
-msgid "History for way {0}"
-msgstr "История линии {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
-#, java-format
-msgid "History for relation {0}"
-msgstr "История для отношения {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:125
-msgid "Close the dialog"
-msgstr "Закрыть диалог"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:143
-msgid "Reload the history from the server"
-msgstr "Скачать историю с сервера"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-"История ещё не инициализирована. Не удалось настроить ссылку на элемент."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-"Не удалось настроить ссылку. ID ссылки: {0} не соответствует ID истории: {1}."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr "Не удалось настроить ссылку. Версия ссылки {0} отсутствует в истории."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr "История ещё не инициализирована. Не удалось настроить текущий элемент."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-"Не удалось настроить текущий элемент. Текущая версия {0} не возможна в "
-"истории."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:52
-msgid "Load history"
-msgstr "Загрузить историю"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65
-#, java-format
-msgid "Parameter ''{0}'' > 0 expected. Got {1}."
-msgstr "Ожидался параметр ''{0}'' > 0. Получено {1}."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
-#, java-format
-msgid "id in parameter ''{0}'' > 0 expected, got {1}."
-msgstr "ожидался id in parameter ''{0}'' > 0, получено {1}."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr "Ожидался объект с id > 0 . Получено {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:180
-#, java-format
-msgid "Loading history for node {0}"
-msgstr "Скачивание истории для точки {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:181
-#, java-format
-msgid "Loading history for way {0}"
-msgstr "Скачивание истории линии {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:182
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr "Скачка истории для отношения {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../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
-msgid "Zoom to this node in the current data layer"
-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
-msgid "Open a history browser with the history of this node"
-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:79
-#, java-format
-msgid "Relation {0}"
-msgstr "Отношение {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36
-#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60
-msgid "not present"
-msgstr "не существует"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
-msgid "User"
-msgstr "Пользователь"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
-msgid "Changeset"
-msgstr "Пакет правок"
-
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
@@ -7958,4 +8311,281 @@
 msgstr "неизвестный"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:119
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+"<b>Масштабировать:</b> Крутите колёсико мыши, сделайте двойной щелчок или "
+"нажмите Ctrl + Вверх/Вниз <b>Двигать карту:</b> Удерживая правую кнопку "
+"мышки, двигайте мышку или используйте клавиши передвижения курсора. "
+"<b>Выбрать:</b> Удерживая левую кнопку мышки, нарисуйте рамку."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid "Slippy map"
+msgstr "Интерактивная карта"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "масштаб"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x от"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "до"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y от"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Номера квадратов"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:138
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr "Не удалось прочитать файл CSS ''help-browser.css''. Исключение: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188
+msgid "JOSM Help Browser"
+msgstr "Браузер справки JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:228
+#, java-format
+msgid ""
+"<html><p class=\"warning-header\">Help content for help topic missing</p><p "
+"class=\"warning-body\">Help content for the help topic <strong>{0}</strong> "
+"is not available yet. It is missing both in your local language ({1}) and in "
+"english.<br><br>Please help to improve the JOSM help system and fill in the "
+"missing information.You can both edit the <a href=\"{2}\">help topic in your "
+"local language ({1})</a> and the <a href=\"{3}\">help topic in english</a>.</"
+"p></html>"
+msgstr ""
+"<html><p class=\"warning-header\">Отсутствует содержимое справки в "
+"справочном разделе</p><p class=\"warning-body\">Содержимое справки в "
+"справочном разделе <strong>{0}</strong> пока ещё не доступно. Он ешё не "
+"написан ни на русском ({1}), ни на английском языке.<br><br>Пожалуйста, "
+"помогите улучшить справочную систему JOSM и допишите недостающую информацию. "
+"Вы можете отредактировать статью <a href=\"{2}\">help на русском ({1})</a> и "
+"статью <a href=\"{3}\">help на английском языке</a>.</p></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:250
+#, java-format
+msgid ""
+"<html><p class=\"error-header\">Error when retrieving help information</p><p "
+"class=\"error-body\">The content for the help topic <strong>{0}</strong> "
+"could not be loaded. The error message is (untranslated):<br><tt>{1}</tt></"
+"p></html>"
+msgstr ""
+"<html><p class=\"error-header\">Произошла ошибка при получении справочной "
+"информации</p><p class=\"error-body\">Невозможно загрузить содержимое "
+"справочной статьи <strong>{0}</strong>. Сообщение об ошибке (не переведено):"
+"<br><tt>{1}</tt></p></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:352
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+"<html>Не удалось открыть справочную страницу по ссылке {0}.<br>Возможно в "
+"сети проблемы, поэтому проверьте<br>ваше интернет-соединение</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:357
+msgid "Failed to open URL"
+msgstr "Не удалось открыть ссылку"
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:390
+msgid "Open the current help page in an external browser"
+msgstr "Открыть текущую страницу справки во внешнем браузере"
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:402
+msgid "Edit the current help page"
+msgstr "Править текущую страницу справки"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:409
+#, java-format
+msgid ""
+"<html>The current URL <tt>{0}</tt><br>is an external URL. Editing is only "
+"possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
+msgstr ""
+"<html>Текущая ссылка <tt>{0}</tt><br>это внешняя ссылка. Только справочные "
+"статьи можно редактировать<br>на сервере справки<tt>{1}</tt>.</html>"
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:432
+msgid "Reload the current help page"
+msgstr "Загрузить заново текущую страницу справки"
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:447
+msgid "Go to the previous page"
+msgstr "Перейти на предыдущую страницу"
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:467
+msgid "Go to the next page"
+msgstr "Перейти на следующую страницу"
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:483
+msgid "Go to the JOSM help home page"
+msgstr "Перейти на начальную страницу справки JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:514
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+"Предупреждение: плохое расположение в документе HTML. Исключение было: "
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:564
+msgid "Failed to open help page. The target URL is empty."
+msgstr "Не удалось открыть справочную страницу. Ссылка пуста."
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565
+msgid "Failed to open help page"
+msgstr "Не удалось открыть справочную страницу"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr "Широта: "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr "Долгота: "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136
+msgid "Coordinates"
+msgstr "Координаты"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for node {0}"
+msgstr "История точки {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#, java-format
+msgid "History for way {0}"
+msgstr "История линии {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#, java-format
+msgid "History for relation {0}"
+msgstr "История для отношения {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:143
+msgid "Reload the history from the server"
+msgstr "Скачать историю с сервера"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+"История ещё не инициализирована. Не удалось настроить ссылку на элемент."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+"Не удалось настроить ссылку. ID ссылки: {0} не соответствует ID истории: {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr "Не удалось настроить ссылку. Версия ссылки {0} отсутствует в истории."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr "История ещё не инициализирована. Не удалось настроить текущий элемент."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+"Не удалось настроить текущий элемент. Текущая версия {0} не возможна в "
+"истории."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:54
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:66
+msgid "Load history"
+msgstr "Загрузить историю"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got {1}."
+msgstr "Ожидался параметр ''{0}'' > 0. Получено {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:98
+#, java-format
+msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+msgstr "ожидался id in parameter ''{0}'' > 0, получено {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:143
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr "Ожидался объект с id > 0 . Получено {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:195
+#, java-format
+msgid "Loading history for node {0}"
+msgstr "Скачивание истории для точки {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:196
+#, java-format
+msgid "Loading history for way {0}"
+msgstr "Скачивание истории линии {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:197
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr "Скачка истории для отношения {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../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
+msgid "Zoom to this node in the current data layer"
+msgstr "Приблизиться к этой точке в текущем слое"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242
+msgid "Open a history browser with the history of this node"
+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:79
+#, java-format
+msgid "Relation {0}"
+msgstr "Отношение {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60
+msgid "not present"
+msgstr "не существует"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
+msgid "Changeset"
+msgstr "Пакет правок"
+
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
 #, java-format
@@ -7972,8 +8602,4 @@
 msgstr ""
 "<html>Версия <strong>{0}</strong> Создано на <strong>{1}</strong></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
-msgid "anonymous"
-msgstr "анонимный"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
@@ -8171,7 +8797,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87
-#, fuzzy
 msgid "Upload to a new changeset"
-msgstr "Открыть новый пакет правок"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88
@@ -8181,12 +8806,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97
-#, fuzzy
 msgid "Upload to an existing changeset"
-msgstr "Обновление пакета правок..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98
-#, fuzzy
 msgid "Upload data to an already existing and open changeset"
-msgstr "Загрузить данные на сервер в уже открытый пакет правок"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142
@@ -8239,11 +8862,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99
-#, fuzzy
 msgid ""
 "Warning: failed to put Credential Dialog always on top. Caught security "
 "exception."
 msgstr ""
-"Внимание: невозможно разместить диалоговое окно поверх всех окон. Исключение "
-"в: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105
@@ -8260,12 +8880,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237
-#, fuzzy
 msgid "Please enter the user name of your OSM account"
-msgstr "Пожалуйста, введите имя пользователя"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238
-#, fuzzy
 msgid "Please enter the password name of your OSM account"
-msgstr "Введите теги, описывающие ваш трек."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240
@@ -8302,7 +8920,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279
-#, fuzzy
 msgid "Authenticate"
-msgstr "Атлетика"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280
@@ -8311,7 +8928,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293
-#, fuzzy
 msgid "Cancel authentication"
-msgstr "Достигнут перекрёсток"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
@@ -8603,5 +9219,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:465
 msgid "Upload"
 msgstr "Загрузить на сервер"
@@ -8623,53 +9239,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:116
 msgid "Settings"
 msgstr "Настройки"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 "Решить, как передать данные на сервер и какие использовать пакеты правок"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:451
 msgid "Tags of new changeset"
 msgstr "Теги нового пакета правок"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr "Применить теги на пакет правок, который загружен"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
-"Открыть новый пакет правок и использовать его в следующей загрузке на сервер"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-#, fuzzy
-msgid "Advanced"
-msgstr "улучшенный"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130
-#, fuzzy
 msgid "Configure advanced settings"
-msgstr "Настроить доступные модули."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467
+#, java-format
 msgid "Upload to ''{0}''"
-msgstr "Загрузка данных на сервер по слою ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:358
 msgid "Upload Changes"
 msgstr "Загрузить изменения на сервер"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360
 msgid "Upload the changed primitives"
 msgstr "Загрузить на сервер изменённые элементы"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:366
 msgid "Please enter a comment for this upload changeset (min. 3 characters)"
 msgstr ""
@@ -8677,21 +9285,21 @@
 "(мин. 3 символа)"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:367
 msgid "Illegal upload comment"
 msgstr "неверный комментарий загрузки на сервер"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:376
 msgid "Please enter a valid chunk size first"
 msgstr "Please enter a valid chunk size first"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:377
 msgid "Illegal chunk size"
 msgstr "Неправильный размер куска"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411
 msgid "Cancel the upload and resume editing"
 msgstr "Отменить загрузку на сервер и продолжить редактирование"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453
 #, java-format
 msgid "Tags of changeset {0}"
@@ -8737,17 +9345,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading <strong>{0} object</strong> to <strong>1 changeset</strong>"
 msgid_plural ""
 "Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
 msgstr[0] ""
-"<html>Пожалуйста, подтвердите удаление <strong>{0} объектов</strong> из "
-"<strong>{1} отношений</strong>.</html>"
 msgstr[1] ""
-"<html>Пожалуйста, подтвердите удаление <strong>{0} объектов</strong> из "
-"<strong>{1} отношений</strong>.</html>"
-msgstr[2] ""
-"<html>Пожалуйста, подтвердите удаление <strong>{0} объектов</strong> из "
-"<strong>{1} отношений</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86
@@ -8761,5 +9362,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91
@@ -8804,17 +9404,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88
-#, fuzzy
 msgid "Click to return to the Upload Dialog"
-msgstr "Нажмите, чтобы закрыть диалог"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92
-#, fuzzy
 msgid "Abort"
-msgstr "О программе"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94
-#, fuzzy
 msgid "Click to abort uploading"
-msgstr "Нажмите, чтобы прервать процесс объединения точек"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99
@@ -8827,10 +9424,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
-#, fuzzy, java-format
+#, java-format
 msgid "There is {0} object to upload left."
 msgid_plural "There are {0} objects to upload left."
-msgstr[0] "Выделите объекты, которые надо загрузить на сервер"
-msgstr[1] "Выделите объекты, которые надо загрузить на сервер"
-msgstr[2] "Выделите объекты, которые надо загрузить на сервер"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112
@@ -8844,7 +9440,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123
-#, fuzzy
 msgid "Changeset is full"
-msgstr "Информация о пакете правок"
+msgstr ""
 
 #. we tried to delete an already deleted primitive.
@@ -8910,7 +9505,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94
-#, fuzzy
 msgid "Please select the upload strategy:"
-msgstr "Пожалуйста, выберите ряд для удаления."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110
@@ -8936,8 +9530,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191
-#, fuzzy
 msgid "Fill up one changeset and return to the Upload Dialog"
 msgstr ""
-"Открыть новый пакет правок и использовать его в следующей загрузке на сервер"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193
@@ -9135,10 +9727,5 @@
 "изображениями.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:336
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java:31
-msgid "JPEG images (*.jpg)"
-msgstr "Изображения JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:370
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9146,5 +9733,5 @@
 msgstr "Название: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:384
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:374
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9152,5 +9739,5 @@
 msgstr "Описание: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:389
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #, java-format
 msgid "{0} track"
@@ -9161,5 +9748,5 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
 #: build/trans_presets.java:3193
@@ -9167,17 +9754,17 @@
 msgstr "Описание"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Timespan"
 msgstr "Период"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
 msgid "Length"
 msgstr "Длина"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:443
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:433
 msgid "Length: "
 msgstr "Длина: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:436
 #, java-format
 msgid "{0} route, "
@@ -9187,5 +9774,5 @@
 msgstr[2] "{0} маршрутов, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:437
 #, java-format
 msgid "{0} waypoint"
@@ -9195,10 +9782,10 @@
 msgstr[2] "{0} путевых точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Преобразовать в слой данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9208,10 +9795,10 @@
 "считается вредоносной.<br>Если хотите загрузить треки, ознакомьтесь с этим:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
@@ -9222,29 +9809,29 @@
 msgstr "Преобразовано из: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:959
 msgid "Download from OSM along this track"
 msgstr "Скачать с OSM данные вдоль этого трека"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 msgid "Download everything within:"
 msgstr "Скачать всё в пределах:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #, java-format
 msgid "{0} meters"
 msgstr "{0} метров"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
 msgid "Maximum area per request:"
 msgstr "Максимальная область для одного запроса:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:952
 #, java-format
 msgid ""
@@ -9255,9 +9842,9 @@
 "Продолжить?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1063
 msgid "No GPX track available in layer to associate audio with."
 msgstr "На слое отсутствует трек GPX, чтобы наложить звук."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1232
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9267,5 +9854,5 @@
 "будут пропущены или перенесены в начало трека."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1239
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9435,24 +10022,24 @@
 msgstr[2] "{0} точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Файлы GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Файл {0} загружен под именем \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Ошибка разбора {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Невозможно прочитать \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9464,34 +10051,34 @@
 "прочитаете на фото и выберите часовой пояс <hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
 msgid "Photo time (from exif):"
 msgstr "Время фотоснимка (из EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
 msgid "Gps time (read from the above photo): "
 msgstr "Время GPS (прочтите на фото вверху): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [дд/мм/гггг чч:мм:сс]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
 msgid "I'm in the timezone of: "
 msgstr "Я нахожусь в часовом поясе: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
 msgid "No date"
 msgstr "Без даты"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
 msgid "Open an other photo"
 msgstr "Открыть другое фото"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Синхронизировать время по фотографии из GPS-приемника"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
 msgid ""
 "Error while parsing the date.\n"
@@ -9501,117 +10088,114 @@
 "Пожалуйста, используйте запрашиваемый формат"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
 msgid "Invalid date"
 msgstr "Недопустимая дата"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
 msgid "<No GPX track loaded yet>"
 msgstr "<Не загружены треки GPX>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
 msgid "GPX track: "
 msgstr "Трек GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
 msgid "Open another GPX trace"
 msgstr "Открыть другой трек GPX"
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+msgid ""
+"<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
-msgid ""
-"<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
 msgid "Auto-Guess"
 msgstr "Авто-Угадывание"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
 msgid "Override position for: "
-msgstr "Обновление позиции для: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
 msgid "Timezone: "
 msgstr "Часовой пояс: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
 msgid "Offset:"
 msgstr "Смещение:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
 msgid "No gpx selected"
-msgstr "Ничего не выделено!"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
-msgstr "Совпало {0} из {1} фотографий с GPX треком."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
 msgid "Correlate images with GPX track"
 msgstr "Сопоставить изображения с GPX треком"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
 msgid "Correlate"
 msgstr "Совпадения"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
 msgid "Invalid timezone"
 msgstr "Недопустимый часовой пояс"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
 msgid "Invalid offset"
 msgstr "Недопустимое смещение"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Try Again"
-msgstr "Трассировка"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Часовой пояс: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Минуты: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Секунды: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
+#, java-format
 msgid "<br>(Time difference of {0} days)"
-msgstr "(Разница во времени {0} дней)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9621,21 +10205,21 @@
 "можете вручную совместить фотографии с помощью движков."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
 msgid "Matching photos to track failed"
 msgstr "Сопоставление фотографий треку прервано"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
 msgid "Adjust timezone and offset"
 msgstr "Настройка часового пояса и смещения"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
 msgid "The selected photos don't contain time information."
 msgstr "Выбранные фотографии не содержат информацию о времени."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "Photos don't contain time information"
 msgstr "Фотографии не содержат информацию о времени"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
@@ -9643,17 +10227,17 @@
 "Точки в выбранном GPX треке не содержат времени. Пожалуйста, выберите другой."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid "GPX Track has no time information"
 msgstr "GPX трек не содержит информации о времени"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
 msgid "You should select a GPX track"
 msgstr "Необходимо выбрать трек GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "No selected GPX track"
 msgstr "Трек GPX не выделен"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
 #, java-format
 msgid ""
@@ -9664,5 +10248,5 @@
 "Ожидаемый формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
 #, java-format
 msgid ""
@@ -9715,5 +10299,5 @@
 msgstr "Ошибка чтения файлов в каталоге {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
@@ -9748,13 +10332,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584
-#, fuzzy
-msgid "Always delete and don't show this dialog again"
-msgstr "Всегда перемещать и больше не показывать этого предупреждения"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 msgid "Image file could not be deleted."
-msgstr "Файл не найден"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
@@ -9783,7 +10361,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
-#, fuzzy
 msgid "Show previous Image"
-msgstr "Предыдущее изображение"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
@@ -9791,7 +10368,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121
-#, fuzzy, java-format
+#, java-format
 msgid "Geoimage: {0}"
-msgstr "Веб-страница: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
@@ -9800,7 +10377,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
-#, fuzzy
 msgid "Delete File from disk"
-msgstr "Удалить из отношения"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117
@@ -9810,7 +10386,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121
-#, fuzzy
 msgid "Show next Image"
-msgstr "Следующее изображение"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
@@ -9826,5 +10401,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
 #, java-format
 msgid ""
@@ -9835,5 +10410,5 @@
 "Высота: {0} м"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:247
 #, java-format
 msgid ""
@@ -9843,4 +10418,8 @@
 "\n"
 "{0} км/ч"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java:31
+msgid "JPEG images (*.jpg)"
+msgstr "Изображения JPEG (*.jpg)"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
@@ -9941,9 +10520,9 @@
 msgstr "Невозможно отобразить URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:130
 msgid "Illegal dash pattern, values must be positive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:136
 msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr ""
@@ -9971,5 +10550,5 @@
 #, java-format
 msgid "Default value is ''{0}''."
-msgstr "Текущее значение - ''{0}''."
+msgstr "Значение по умолчанию - ’’{0}’’."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
@@ -9979,5 +10558,5 @@
 #: ../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
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
 msgstr "Пожалуйста, выберите ряд для редактирования."
@@ -9991,5 +10570,5 @@
 #: ../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
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -10547,5 +11126,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 msgid "Update"
 msgstr "Обновить"
@@ -10632,8 +11211,4 @@
 msgstr "Код проекции"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
-msgid "Bounds"
-msgstr "Границы"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:94
 msgid "Map Projection"
@@ -10645,36 +11220,33 @@
 msgstr "Невозможно активировать проекцию {0}. Используется Меркатор"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
 msgid "Host:"
-msgstr "Студенческое общежитие"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
 msgctxt "server"
 msgid "Port:"
-msgstr "Порт:"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
 msgid ""
 "Please enter a username and a password if your proxy requires authentication."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
 msgid "Password:"
-msgstr "Пароль"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
 msgid "No proxy"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
+msgid "Use standard system settings"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204
 msgid ""
 "Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
@@ -10682,13 +11254,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
 msgid "Manually configure a HTTP proxy"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
 msgid "Use a SOCKS proxy"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
 msgid ""
 "Warning: JOSM is configured to use proxies from the system setting, but the "
@@ -10696,5 +11268,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
 msgid "Proxy Settings"
 msgstr "Параметры прокси-сервера"
@@ -11128,6 +11700,32 @@
 msgstr "Группа заготовок {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
+msgid "Min. latitude"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:73
+msgid "Min. longitude"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:75
+msgid "Max. latitude"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:77
+msgid "Max. longitude"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:87
+msgid ""
+"URL from www.openstreetmap.org (you can paste a download URL here to specify "
+"a bounding box)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/AllFormatsImporter.java:15
+msgid "All Formats"
+msgstr "Все форматы"
+
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
@@ -11143,9 +11741,8 @@
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93
-#, fuzzy
 msgid ""
 "Warning: illegal value of attribute '{0}'' of element ''{1}'' in server "
 "capabilities. Got ''{2}"
-msgstr "Неверное значение атрибута ''{0}'' на теге XML ''{1}''. Получено {2}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
@@ -11164,12 +11761,48 @@
 "правок. Получено ''{0}''"
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:126
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:128
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:132
+#, java-format
+msgid "Illegal longitude value for parameter ''{0}'', got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:130
+#, java-format
+msgid "Illegal latitude value for parameter ''{0}'', got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:293
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:298
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:300
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:307
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:313
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:318
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:324
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:329
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:341
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:348
+#, java-format
+msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:362
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:366
+msgid ""
+"Can''t create a changeset query including both the query parameters ''uid'' "
+"and ''display_name''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:391
+#, java-format
+msgid "Unsupported parameter ''{0}'' in changeset query string"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
 "Proxy won't be used."
 msgstr ""
-"Неожиданный формат новой версии изменённого элемента \"{0}\". Получено \"{1}"
-"\""
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
@@ -11185,11 +11818,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
 "use no proxy."
 msgstr ""
-"Предупреждение: неожиданное значение ключа ''{0}'' в параметрах, получено "
-"''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
@@ -11224,12 +11855,11 @@
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83
-#, fuzzy
 msgid "Parsing response from server..."
-msgstr "Запрос на сервер имён ..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Unexpected XML element with name ''{0}''"
-msgstr "неожиданный номер столбца {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
@@ -11238,8 +11868,17 @@
 msgstr "Невозможно экспортировать ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#, java-format
-msgid "Could not read ''{0}''."
-msgstr "Невозможно прочитать \"{0}\""
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:38
+#, java-format
+msgid "Could not import ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:45
+msgid "Could not import files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:73
+#, java-format
+msgid "<html>Could not read files.<br> Error is: <br>{0}</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:39
@@ -11336,4 +11975,12 @@
 msgid "Unknown mode {0}."
 msgstr "Неизвестный режим {0}."
+
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:20
+msgid "Image Files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:20
+msgid "folder"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
@@ -11438,7 +12085,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
-#, fuzzy, java-format
+#, java-format
 msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
-msgstr "отсутствует пункт настройки \"{0}\". Не могу инициализировать OsmApi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161
@@ -11508,14 +12155,13 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415
-#, fuzzy
 msgid "Preparing upload request..."
-msgstr "Начало загрузки на сервер за один запрос..."
+msgstr ""
 
 #. Upload to the server
 #.
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects..."
-msgstr "Передача объектов на сервер. Кол-во: {0}..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444
@@ -11584,4 +12230,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:106
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:120
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:135
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
@@ -11596,4 +12246,83 @@
 msgstr "обязательный атрибут ''{0}'' отсутствует"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
+#, java-format
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"неверное значение обязательного атрибута ''{0}'' типа long, текущее значение "
+"''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:98
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94
+#, java-format
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"неверное значение обязательного атрибута ''{0}'' типа long (>=0), текущее "
+"значение ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:112
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:108
+#, java-format
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+"Неверное значение обязательного атрибута ''{0}'' типа дубль. Получено''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:139
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:135
+#, java-format
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"неверное значение обязательного атрибута ''{0}'' типа boolean, текущее "
+"значение ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:146
+msgid "<anonymous>"
+msgstr "<анонимный>"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:202
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:198
+#, java-format
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"неверное значение обязательного атрибута ''{0}'' типа OsmPrimitiveType, "
+"текущее значение ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:231
+#, java-format
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:241
+msgid ""
+"Illegal document structure. Found node, way, or relation outside of "
+"''create'', ''modify'', or ''delete''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:259
+#, java-format
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:307
+msgid "Parsing changeset content ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
@@ -11638,5 +12367,5 @@
 msgstr "Неверное значение для атрибута ''uid''. Получено''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:216
 msgid "Parsing list of changesets..."
 msgstr "Анализ списка пакетов правок..."
@@ -11682,58 +12411,7 @@
 msgstr "Файлы сервера OSM сжаты с помощью gzip"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:75
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
-#, java-format
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"неверное значение обязательного атрибута ''{0}'' типа long, текущее значение "
-"''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:78
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94
-#, java-format
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"неверное значение обязательного атрибута ''{0}'' типа long (>=0), текущее "
-"значение ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:108
-#, java-format
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-"Неверное значение обязательного атрибута ''{0}'' типа дубль. Получено''{1}''."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:135
-#, java-format
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-"неверное значение обязательного атрибута ''{0}'' типа boolean, текущее "
-"значение ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:146
-msgid "<anonymous>"
-msgstr "<анонимный>"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:198
-#, java-format
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"неверное значение обязательного атрибута ''{0}'' типа OsmPrimitiveType, "
-"текущее значение ''{1}''"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:238
 msgid "Parsing OSM history data ..."
 msgstr "Разбор данных истории OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38
-msgid "Error during parse."
-msgstr "Ошибка при разборе."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
@@ -11853,16 +12531,16 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Illegal value for attribute ''changeset'' on new object {1}. Got {0}. "
 "Resetting to 0."
-msgstr "Неверное значение атрибута ''{0}'' на теге XML ''{1}''. Получено {2}."
+msgstr ""
 
 #. for an existing primitive this is a problem
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
-#, fuzzy, java-format
+#, java-format
 msgid "Illegal value for attribute ''changeset''. Got {0}."
-msgstr "Неверное значение для атрибута ''uid''. Получено''{0}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441
@@ -11937,34 +12615,43 @@
 msgstr "Скачивание зависимых отношений..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:59
 msgid "Reading changesets..."
 msgstr "Чтение пакетов правок..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:65
 msgid "Downloading changesets ..."
 msgstr "Скачивание пакетов правок..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:93
 #, java-format
 msgid "Reading changeset {0} ..."
 msgstr "Чтение пакета правок {0} ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:99
 #, java-format
 msgid "Downloading changeset {0} ..."
 msgstr "Скачивание пакета правок {0} ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:129
+#, java-format
 msgid "Downloading {0} changeset ..."
 msgid_plural "Downloading {0} changesets ..."
-msgstr[0] "Скачивание пакетов правок..."
-msgstr[1] "Скачивание пакетов правок..."
-msgstr[2] "Скачивание пакетов правок..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142
-#, fuzzy, java-format
-msgid "({0}/{1}) Downloading changeset {0} ..."
-msgstr "Скачивание пакета правок {0} ..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:144
+#, java-format
+msgid "({0}/{1}) Downloading changeset {2} ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:173
+#, java-format
+msgid "Expected value of type integer > 0 for parameter ''{0}'', got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:184
+#, java-format
+msgid "Downloading content for changeset {0} ..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -12019,59 +12706,58 @@
 msgstr "Неверное значение атрибута ''{0}'' на теге XML ''{1}''. Получено {2}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
 msgid "Starting to upload with one request per primitive ..."
 msgstr "Начало загрузки на сервер с отдельным запросом на каждый элемент ..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:85
+#, java-format
+msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
+msgstr ""
+"{0}% ({1}/{2}), {3} осталось. Загрузка на сервер точки ''{4}'' (id: {5})"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:86
 #, java-format
-msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
-msgstr ""
-"{0}% ({1}/{2}), {3} осталось. Загрузка на сервер точки ''{4}'' (id: {5})"
+msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
+msgstr ""
+"{0}% ({1}/{2}), {3} осталось. Загрузка на сервер линии ''{4}'' (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:87
-#, java-format
-msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
-msgstr ""
-"{0}% ({1}/{2}), {3} осталось. Загрузка на сервер линии ''{4}'' (id: {5})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr "{0}% ({1}/{2}), {3} осталось. Загрузка отношения ''{4}'' (id: {5})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:120
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:119
 msgid "Starting to upload in one request ..."
 msgstr "Начало загрузки на сервер за один запрос..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141
 #, java-format
 msgid "Value >0 expected for parameter ''{0}'', got {1}"
 msgstr "Значение >0 ожидалось для параметра ''{0}'', получено {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:143
 msgid "Starting to upload in chunks..."
 msgstr "Начало передачи на сервер по кускам..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:158
 #, java-format
 msgid "({0}/{1}) Uploading {2} objects..."
 msgstr "({0}/{1}) Передача {2} объектов..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
 msgid "Uploading data ..."
 msgstr "Загрузка данных на сервер ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192
-#, fuzzy
 msgid "Unexpected id 0 for osm primitive found"
-msgstr "Удалённые или перемещённые элементы"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
 msgid "Update Plugins"
 msgstr "Обновить модули"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:161
 msgid "Download Plugins"
 msgstr "Скачать модули"
@@ -12284,9 +12970,9 @@
 msgstr "Плагин {0} не доступен. Обновление пропущено."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "All installed plugins are up to date."
 msgstr "Все установленные модули имеют последнюю версию."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:122
 #, java-format
 msgid ""
@@ -12299,9 +12985,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 msgid "Download missing plugins"
 msgstr "Скачать недостающие модули"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163
 #, java-format
 msgid ""
@@ -12314,14 +13000,14 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:248
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Версия {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:256
 msgid "Plugin bundled with JOSM"
 msgstr "Модуль из поставки JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:414
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -12360,5 +13046,5 @@
 msgstr "Неожиданное исключение"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:92
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:103
 msgid ""
 "<html><p>You've encountered an error in JOSM. Before you file a bug<br>make "
@@ -12368,5 +13054,5 @@
 "<br>убедитесь, что вы работаете с последней версией JOSM здесь:</p></html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:96
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:107
 msgid ""
 "<html>You should also update your plugins. If neither of those help "
@@ -12376,16 +13062,13 @@
 "помогло,<br>сообщите нам об ошибке, перейдя по ссылке:</p></html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:99
-msgid ""
-"<html><p>There the the error information provided below should already "
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:110
+msgid ""
+"<html><p>There the error information provided below should already "
 "be<br>filled out for you. Please include information on how to "
 "reproduce<br>the error and try to supply as much detail as possible.</p></"
 "html>"
 msgstr ""
-"<html><p>Информация об ошибке уже добавлена ниже<br>для облегчения работы. "
-"Вы только опишите подробно, то, как возникла эта<br>ошибка и постарайтесь "
-"сделать это поподробнее.</p></html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:103
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:114
 msgid ""
 "<html><p>Alternatively if that doesn't work you can manually fill in the "
@@ -12395,26 +13078,26 @@
 "заполнить<br>по этой ссылке:</p></html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:111
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:122
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Текст уже скопирован в буфер обмена)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:120
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
 msgid "You've encountered a bug in JOSM"
 msgstr "Произошла ошибка при работе в JOSM"
 
 #: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23
-#, fuzzy, java-format
+#, java-format
 msgid "Expected unique id > 0 for primitive id, got {0}"
-msgstr "Ожидалось значение > 0 для параметра ''{0}'', получено {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28
-#, fuzzy, java-format
+#, java-format
 msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
-msgstr "Ожидалось значение > 0 для параметра ''{0}'', получено {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48
-#, fuzzy, java-format
+#, java-format
 msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
-msgstr "Ожидался параметр ''{0}'' > 0, получено {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
@@ -12680,5 +13363,5 @@
 "Исключение было: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107
 #, java-format
 msgid ""
@@ -12689,5 +13372,5 @@
 "геометрию окна из параметров."
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:113
 #, java-format
 msgid ""
@@ -12698,5 +13381,5 @@
 "Получено {2}. Невозможно восстановить геометрию окна с помощью параметров."
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:115
 #, java-format
 msgid ""
@@ -12707,5 +13390,5 @@
 "было: {2}. Невозможно восстановить геометрию окна с помощью параметров."
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:122
 #, java-format
 msgid ""
@@ -14676,16 +15359,31 @@
 "следующей ссылке:"
 
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
-#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
 msgid "Edit relation"
 msgstr "Редактировать отношение"
 
-#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
 msgid "Edit relations"
 msgstr "Редактировать отношения"
 
-#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:72
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:71
 msgid "No relation is selected"
 msgstr "Нет выделенного отношения"
+
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RemoveRelationMemberCommand.java:70
+#, java-format
+msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
+msgstr "Удалить точку ''{0}'' в позиции {1} из отношения ''{2}''"
+
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RemoveRelationMemberCommand.java:71
+#, java-format
+msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
+msgstr "Удалить линию ''{0}'' в позиции {1} из отношения ''{2}''"
+
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RemoveRelationMemberCommand.java:72
+#, java-format
+msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
+msgstr "Удалить отношение ''{0}'' в позиции {1} из отношения ''{2}''"
 
 #. TODO Use constructor with shortcut
@@ -14900,4 +15598,8 @@
 msgstr "Ошибка разбора {0}: {1}"
 
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:40
+msgid "Surveyor waypoint layer"
+msgstr ""
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
 #, java-format
@@ -14909,4 +15611,8 @@
 msgid "{0} end"
 msgstr "{0} конец"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:72
+msgid "Waypoint Description"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -14974,7 +15680,6 @@
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
-#, fuzzy
 msgid "Even/Odd"
-msgstr "Четные"
+msgstr ""
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
@@ -14987,7 +15692,6 @@
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-#, fuzzy
 msgid "Segments"
-msgstr "Улицы"
+msgstr ""
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
@@ -15004,11 +15708,12 @@
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
-msgid " must be greater than 0"
+#, java-format
+msgid "{0} must be greater than 0"
 msgstr ""
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
-#, fuzzy
-msgid " is not a number"
-msgstr "Максимальный номер"
+#, java-format
+msgid "{0} is not a number"
+msgstr ""
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
@@ -15047,6 +15752,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:93
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:83
 msgid "Validation errors"
 msgstr "Ошибки при проверке"
@@ -15056,10 +15761,10 @@
 msgstr "Проверка не выявила ошибок"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
 msgid "Grid"
 msgstr "Сетка"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -15168,58 +15873,58 @@
 msgstr "Обновление проигнорированных ошибок..."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117
 msgid "Data with errors. Upload anyway?"
 msgstr "Данные содержат ошибки. Всё равно загрузить на сервер?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81
 msgid "Open the validation window."
 msgstr "Открыть окно проверки"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:88
 msgid "Zoom to problem"
 msgstr "Приблизиться к проблеме"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid "Fix"
 msgstr "Исправить"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid "Fix the selected errors."
 msgstr "Исправить выделенные ошибки."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
 msgid "Ignore the selected errors next time."
 msgstr "Игнорировать выделенные ошибки в будущем."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:195
 msgid "Whole group"
 msgstr "Всю группу"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:195
 msgid "Single elements"
 msgstr "Отдельные элементы"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:195
 msgid "Nothing"
 msgstr "Ничего"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196
 msgid "Ignore whole group or individual elements?"
 msgstr "Игнорировать всю группу, или отдельные элементы?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
 msgid "Ignoring elements"
 msgstr "Игнорировать элементы"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:459
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:458
 msgid "Fixing errors ..."
 msgstr "Исправление ошибок ..."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:483
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:482
 #, java-format
 msgid "Fixing ({0}/{1}): ''{2}''"
 msgstr "Исправление ({0}/{1}): ''{2}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:500
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:499
 msgid "Updating map ..."
 msgstr "Обновление карты ..."
@@ -15271,20 +15976,20 @@
 msgstr "Пересекающиеся линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:43
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
 msgid "Duplicated nodes"
 msgstr "Дублированные точки"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Этот тест проверяет, чтобы не было наложенных точек."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:68
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+msgid "Confirmation"
+msgstr "Подтверждение"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
 msgid "Nodes at same position"
 msgstr "Точки в одной и той же позиции"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:130
-msgid "Confirmation"
-msgstr "Подтверждение"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
@@ -15435,7 +16140,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:428
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:438
 msgid "Illegal tag/value combinations"
 msgstr "Неправильная комбинация тегов/значений"
@@ -15443,80 +16148,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:451
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:453
 msgid "Painting problem"
 msgstr "Проблемы отображения"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:463
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Неправильный ключ {0}."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:466
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Tags with empty values"
 msgstr "Теги с пустыми значениями"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid property key"
 msgstr "Неверный ключ свойств"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Invalid white space in property key"
 msgstr "Неправильный пробел в названии ключа"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values start or end with white space"
 msgstr "Значение начинается или заканчивается пробелом"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:492
 msgid "Property values contain HTML entity"
 msgstr "Значения содержат HTML разметку"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:517
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:519
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Ключа ''{0}'' нет в настройках."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:518
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
 msgid "Presets do not contain property key"
 msgstr "Установки не содержат собственно ключа"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:540
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Значение ''{0}'' для ключа ''{1}'' не установлены заранне."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:541
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Presets do not contain property value"
 msgstr "Не содержит зарание устанвленного значения"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:555
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:599
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
 msgid "Check property keys."
 msgstr "Проверить корректность ключей."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Проверьте, что ключ действителен проверен в отношении списка слов."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610
 msgid "Use complex property checker."
 msgstr "Использовать сложную проверку"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:608
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
 msgid "Validate property values and tags using complex rules."
 msgstr "Проверка корректности значений и тегов, использующих сложные правила."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:629
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:630
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:669
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:632
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
 msgid "TagChecker source"
 msgstr "Источник средства проверки тегов"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:695
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -15526,25 +16231,25 @@
 "openstreetmap.org/index.php/User:JLS/speller) или тег проверки файлов данных."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
 msgid "Add a new source to the list."
 msgstr "Добавить в список новый источник."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:694
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
 msgid "Edit the selected source."
 msgstr "Править выбранный источник."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:695
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
 msgid "Delete the selected source from the list."
 msgstr "Удалить источник из списка."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Data sources"
 msgstr "Источники данных"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:717
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
 msgid "Check property values."
 msgstr "Проверить корректность значений"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:718
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
@@ -15552,42 +16257,42 @@
 "установок проверки."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
 msgid "Check for FIXMES."
 msgstr "Проверить для FIXMES."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Ищет точки или линии с FIXME в свойствах какого-либо значения."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
 msgid "Check for paint notes."
 msgstr "Проверить заметки."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Check if map painting found data errors."
 msgstr "Проверить содержит ли нарисованная карта ошибки данных"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
 msgid "Use default data file."
 msgstr "Использовать файл данных по умолчанию."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use the default data file (recommended)."
 msgstr "Используется файл данных установленный по умолчанию"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default tag ignore file."
 msgstr "Использовать по умолчанию файл с игнориованными тегами."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 "Использовать по умолчанию файл с игнориованными тегами (рекомендовано)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default spellcheck file."
 msgstr "Использовать установленный по умолчанию файл проверки правописания"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
@@ -15595,22 +16300,22 @@
 "(рекомендуется)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:844
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:847
 msgid "Fix properties"
 msgstr "Исправить параметры"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:965
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:968
 msgid "Could not find element type"
 msgstr "Не удалось найти тип элемента"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:982
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
 msgid "Could not find warning level"
 msgstr "Не удалось найти  уровень предупреждения"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:994
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Недопустимое выражение ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -15940,4 +16645,8 @@
 msgid "Exception occurred"
 msgstr "Произошла ошибка."
+
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+msgid "Not in cache"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -16053,5 +16762,5 @@
 msgstr "Автоматическое скачивание"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:103
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -16060,19 +16769,19 @@
 "искажена"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:105
 msgid "(deactivated)"
 msgstr "(деактивировано)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:156
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:158
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
 #, java-format
 msgid ""
@@ -16087,13 +16796,13 @@
 "попытаться извлечь квадраты WMS?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
 msgid "Yes, fetch images"
 msgstr "Да, выбрать изображения"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "Invalid URL?"
 msgstr "Ошибочная ссылка?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -16102,37 +16811,37 @@
 "измените разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
 msgid "Download visible tiles"
 msgstr "Скачать видимые квадраты карты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
 msgid "Change resolution"
 msgstr "Изменить разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 msgid "Reload erroneous tiles"
 msgstr "Перезагрузить ошибочные квадраты карты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
 msgid "Alpha channel"
 msgstr "Альфа канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:369
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
 msgid "Save WMS layer to file"
 msgstr "Сохранить слой WMS в файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:373
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
 msgid "Save WMS layer"
 msgstr "Сохраниеть WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:397
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
 msgid "Load WMS layer from file"
 msgstr "Загрузить слой WMS из файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
 msgid "Load WMS layer"
 msgstr "Загрузить WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -16140,13 +16849,13 @@
 "Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
 msgid "File Format Error"
 msgstr "Ошибка формата файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 msgid "Error loading file"
 msgstr "Ошибка при загрузке файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
 msgid "Set WMS Bookmark"
 msgstr "Установить закладку WMS"
@@ -22987,7 +23696,6 @@
 #. item "Shops/Car Dealer" text "Operator"
 #: build/trans_presets.java:2506
-#, fuzzy
 msgid "Bike Dealer"
-msgstr "Трассировщик озёр"
+msgstr ""
 
 #. item "Shops/Bike Dealer"
@@ -28566,81 +29274,25 @@
 msgstr "Sicily - Италия"
 
-#~ msgid "Updating primitive"
-#~ msgstr "Обновление элемента"
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Отсутствует закрывающая скобка"
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Текущее число изменений превысило максимальное, текущее - {0}, "
-#~ "максимальное - {1}"
-
-#~ msgid "User with the same uid but different name found"
-#~ msgstr ""
-#~ "Найден пользователь с тем же идентификатором пользователя, но с другим "
-#~ "именем"
-
-#~ msgid "Use an open changeset"
-#~ msgstr "Использовать открытый пакет правок"
-
-#~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr ""
-#~ "<html>Я могу сфотографировать экран GPS приёмника.<br>Это поможет?</html>"
-
-#~ msgid "All images"
-#~ msgstr "Все изображения"
-
-#~ msgid "Images with no exif position"
-#~ msgstr "Изображения без координат в заголовках Exif"
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "Картинки без тегов"
-
-#~ msgid "Found {0} matches of {1} in GPX track {2}"
-#~ msgstr "Надено {0} совпадений из {1} в GPX треке {2}"
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "Трек GPX загружен"
-
-#~ msgid "Offset between track and photos: {0}m {1}s"
-#~ msgstr "Смещение между треком и фотографией: {0}м {1}с"
-
-#~ msgid "Default Values"
-#~ msgstr "Значения по умолчанию"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Использовать прокси-сервер"
-
-#~ msgid "Anonymous"
-#~ msgstr "Анонимный"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Адрес"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Порт"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Имя пользователя прокси-сервера"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Пароль"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "Ошибка! Возможно отсутствуют теги."
+#~ msgid "No data imported."
+#~ msgstr "Данные не импортированы"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Неизвестное расширение файла."
+
+#~ msgid "Email"
+#~ msgstr "Электронная почта"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Несохранённые изменения"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Соединение с OSM сервером..."
+
+#~ msgid "Unknown version"
+#~ msgstr "Неизвестная версия"
 
 #~ msgid "Preparing data..."
 #~ msgstr "Подготовка данных..."
 
-#~ msgid "Preparing..."
-#~ msgstr "Подготовка..."
-
-#~ msgid "Uploading..."
-#~ msgstr "Загрузка на сервер..."
-
 #~ msgid "Incorrect password or username."
 #~ msgstr "Неправильный пароль или имя пользователя."
@@ -28648,45 +29300,4 @@
 #~ msgid "Enter Password"
 #~ msgstr "Введите пароль"
-
-#~ msgid "Login"
-#~ msgstr "Войти"
-
-#~ msgid "Error: failed to add authentication credentials to the connection."
-#~ msgstr ""
-#~ "Ошибка: не удалось добавить учётные данные проверки подлинности к "
-#~ "соединению."
-
-#~ msgid "Auto-tag source added:"
-#~ msgstr "Добавлен источник авто-тега:"
-
-#~ msgid "Interpolation"
-#~ msgstr "Интерполяция"
-
-#~ msgid "Optional"
-#~ msgstr "Необязательно"
-
-#~ msgid "Shop"
-#~ msgstr "Магазин"
-
-#~ msgid "aqueduct"
-#~ msgstr "акведук"
-
-#~ msgid "No data imported."
-#~ msgstr "Данные не импортированы"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Неизвестное расширение файла."
-
-#~ msgid "Email"
-#~ msgstr "Электронная почта"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Несохранённые изменения"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Соединение с OSM сервером..."
-
-#~ msgid "Unknown version"
-#~ msgstr "Неизвестная версия"
 
 #~ msgid "position"
@@ -28733,4 +29344,7 @@
 #~ msgstr "Открыть в браузере"
 
+#~ msgid "Expected closing parenthesis."
+#~ msgstr "Отсутствует закрывающая скобка"
+
 #~ msgid "Rotate"
 #~ msgstr "Вращать"
@@ -28817,6 +29431,18 @@
 #~ msgstr "Добавьте site-josm.xml, либо страницы Wiki"
 
+#~ msgid "Proxy server host"
+#~ msgstr "Адрес"
+
+#~ msgid "Anonymous"
+#~ msgstr "Анонимный"
+
 #~ msgid "Login name (email) to the OSM account."
 #~ msgstr "Имя пользователя (e-mail) учётной записи OSM"
+
+#~ msgid "Proxy server port"
+#~ msgstr "Порт"
+
+#~ msgid "Proxy server password"
+#~ msgstr "Пароль"
 
 #~ msgid "Found <nd> element in non-way."
@@ -28833,4 +29459,7 @@
 #~ "повторите попытку позже."
 
+#~ msgid "Do not show again"
+#~ msgstr "Больше не показывать"
+
 #~ msgid ""
 #~ "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -28838,4 +29467,7 @@
 #~ msgstr ""
 #~ "Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме."
+
+#~ msgid "All images"
+#~ msgstr "Все изображения"
 
 #~ msgid "Station"
@@ -28877,4 +29509,12 @@
 #~ msgstr "Не найдено изображений с информацией о времени."
 
+#~ msgid ""
+#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
+#~ msgstr ""
+#~ "<html>Я могу сфотографировать экран GPS приёмника.<br>Это поможет?</html>"
+
+#~ msgid "Contact {0}..."
+#~ msgstr "Связаться с {0}..."
+
 #~ msgid "resolved version:"
 #~ msgstr "Разрешённая версия:"
@@ -28882,4 +29522,7 @@
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Для работы модуля нужна более новая версия JOSM: {0}."
+
+#~ msgid "Preparing..."
+#~ msgstr "Подготовка..."
 
 #~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
@@ -28933,4 +29576,7 @@
 #~ msgid "Edit Station"
 #~ msgstr "Править станцию"
+
+#~ msgid "Shop"
+#~ msgstr "Магазин"
 
 #~ msgid "citymap"
@@ -29005,4 +29651,7 @@
 #~ "Пароль передаётся по сети в открытом виде, как параметр запроса.<br><b>Не "
 #~ "используйте ценный пароль.</b></html>"
+
+#~ msgid "Could not read from URL: \"{0}\""
+#~ msgstr "Ошибка соединения с адресом: \"{0}\""
 
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
@@ -29053,7 +29702,16 @@
 #~ msgstr "Невозможно скачать модуль: {0} из {1} доступных"
 
+#~ msgid "Error during parse."
+#~ msgstr "Ошибка при разборе."
+
 #~ msgid "No document open so nothing to save."
 #~ msgstr "Нет открытых документов. Нечего сохранять."
 
+#~ msgid "Parsing error in URL: \"{0}\""
+#~ msgstr "Ошибка разбора ссылки: \"{0}\""
+
+#~ msgid "Load Selection"
+#~ msgstr "Загрузить выделенное"
+
 #~ msgid "Data Layer"
 #~ msgstr "Слой данных"
@@ -29080,6 +29738,12 @@
 #~ msgstr "Имя пользователя OSM (e-mail)"
 
+#~ msgid "Enable proxy server"
+#~ msgstr "Использовать прокси-сервер"
+
 #~ msgid "Error parsing server response."
 #~ msgstr "Ошибка при разборе ответа от сервера."
+
+#~ msgid "GPX Track loaded"
+#~ msgstr "Трек GPX загружен"
 
 #~ msgid "Please enter a search string"
@@ -29198,7 +29862,4 @@
 #~ msgstr "Удалить выбранные"
 
-#~ msgid "Basic"
-#~ msgstr "Основной"
-
 #~ msgid "Delete Layer"
 #~ msgstr "Удалить слой"
@@ -29260,4 +29921,7 @@
 #~ msgstr "Выбор сделает ваш трэк общественным на сайте openstreetmap.org"
 
+#~ msgid "Images with no exif position"
+#~ msgstr "Изображения без координат в заголовках Exif"
+
 #~ msgid ""
 #~ "An error occured while trying to match the photos to the GPX track. You "
@@ -29267,4 +29931,10 @@
 #~ "можете настроить вручную с помощью ползунов соответствие фотографиям."
 
+#~ msgid "Offset between track and photos: {0}m {1}s"
+#~ msgstr "Смещение между треком и фотографией: {0}м {1}с"
+
+#~ msgid "Default Values"
+#~ msgstr "Значения по умолчанию"
+
 #~ msgid "Lambert Zone 4 cache file (.4)"
 #~ msgstr "Lambert зона 4 кэш файл (.4)"
@@ -29320,4 +29990,7 @@
 #~ msgid "Show Author Panel"
 #~ msgstr "Показать панель автора"
+
+#~ msgid "Interpolation"
+#~ msgstr "Интерполяция"
 
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
@@ -29422,4 +30095,7 @@
 #~ msgstr "виадук"
 
+#~ msgid "aqueduct"
+#~ msgstr "акведук"
+
 #~ msgid "Image with path {0} does not exist or is not readable."
 #~ msgstr "Картинка {0}  не существует или произошла ошибка чтения."
@@ -29464,4 +30140,7 @@
 #~ msgstr "Проверка существования примитива {0} в прошлом..."
 
+#~ msgid "Update Selection"
+#~ msgstr "Обновить выборку"
+
 #~ msgid "Missing primitive"
 #~ msgstr "Прошущен примитив"
@@ -29475,4 +30154,7 @@
 #~ msgid "Conflict detected"
 #~ msgstr "Обнаружен конфликт"
+
+#~ msgid "Error while communicating with server."
+#~ msgstr "Ошибка  связи с сервером."
 
 #~ msgid ""
@@ -29509,4 +30191,11 @@
 #~ msgstr "Сбой инициализации API"
 
+#~ msgid ""
+#~ "Current number of changes exceeds the max. number of changes, current is "
+#~ "{0}, max is {1}"
+#~ msgstr ""
+#~ "Текущее число изменений превысило максимальное, текущее - {0}, "
+#~ "максимальное - {1}"
+
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "Сбой инициализации API. Пожалуйста, попробуйте снова позднее."
@@ -29619,4 +30308,7 @@
 #~ "его после загрузки"
 
+#~ msgid "Always move and don't show dialog again"
+#~ msgstr "Всегда перемещать и больше не показывать этого предупреждения"
+
 #~ msgid "Can't search because there is no loaded data."
 #~ msgstr "Поиск невозможен, так как не загружено никаких данных."
@@ -29683,4 +30375,7 @@
 #~ "выделенных элементов"
 
+#~ msgid "Updating primitive"
+#~ msgstr "Обновление элемента"
+
 #~ msgid "Purging 1 primitive"
 #~ msgstr "Очистка 1 элемента"
@@ -29703,4 +30398,7 @@
 #~ msgid "Download referrers..."
 #~ msgstr "Скачать зависимости..."
+
+#~ msgid "Downloading..."
+#~ msgstr "Скачивание..."
 
 #~ msgid "Upload to OSM API failed"
@@ -29713,4 +30411,7 @@
 #~ "Включите, чтобы загрузить на сервер все изменения за один запрос или "
 #~ "отключите, чтобы делать отдельный запрос для каждого изменённого элемента"
+
+#~ msgid "Uploading..."
+#~ msgstr "Загрузка на сервер..."
 
 #~ msgid ""
@@ -29778,4 +30479,7 @@
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "Индекс вне допустимых пределов. Текущее значение {0}"
+
+#~ msgid "Could not read ''{0}''."
+#~ msgstr "Невозможно прочитать \"{0}\""
 
 #~ msgid ""
@@ -29855,4 +30559,16 @@
 
 #~ msgid ""
+#~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
+#~ "missing on this system.</html>"
+#~ msgstr ""
+#~ "<html>Не удаётся создать ссылку URL, потому что кодировка "
+#~ "''{0}''<br>отсутствует в этой системе.</html>"
+
+#~ msgid "Error: failed to add authentication credentials to the connection."
+#~ msgstr ""
+#~ "Ошибка: не удалось добавить учётные данные проверки подлинности к "
+#~ "соединению."
+
+#~ msgid ""
 #~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 #~ "use diff uploads, but API is not able to handle them. Ignoring diff "
@@ -29897,4 +30613,7 @@
 #~ msgid "AgPifoJ - Geotagged pictures"
 #~ msgstr "AgPifoJ - Изображения с геотегами"
+
+#~ msgid "NullPointerException, possibly some missing tags."
+#~ msgstr "Ошибка! Возможно отсутствуют теги."
 
 #~ msgid "Relation: from {0} to {1} via {2}"
@@ -29918,4 +30637,7 @@
 #~ "check the servers address ''{1}'' for typos."
 
+#~ msgid "Delete the selected layer."
+#~ msgstr "Удалить выделенный слой."
+
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
@@ -29935,7 +30657,19 @@
 #~ msgstr "Обновить выделенные элементы с сервера"
 
+#~ msgid "Found {0} matches of {1} in GPX track {2}"
+#~ msgstr "Надено {0} совпадений из {1} в GPX треке {2}"
+
 #~ msgid "help"
 #~ msgstr "Справка"
 
+#~ msgid "Optional"
+#~ msgstr "Необязательно"
+
+#~ msgid "Login"
+#~ msgstr "Войти"
+
+#~ msgid "Proxy server username"
+#~ msgstr "Имя пользователя прокси-сервера"
+
 #~ msgid "No type found. History is empty."
 #~ msgstr "Тип не найден. История пуста."
@@ -29949,4 +30683,7 @@
 #~ msgid "latitude"
 #~ msgstr "широта"
+
+#~ msgid "Use an open changeset"
+#~ msgstr "Использовать открытый пакет правок"
 
 #~ msgid ""
@@ -29965,4 +30702,11 @@
 #~ "Найден модуль {0} версии {1} но для этой версии JOSM требуется, модуль по "
 #~ "крайней мере версии {2}. Пожалуйста, обновите модуль."
+
+#~ msgid "Failed to launch the external help browser"
+#~ msgstr "Не удалось запустить внешний браузер справки"
+
+#~ msgid "Failed to read command. Exiting help browser. Exception was:"
+#~ msgstr ""
+#~ "Невозможно прочитать команду. Выход из браузера справки. Исключение было:"
 
 #~ msgid "Set manually the Lambert zone"
@@ -29981,4 +30725,36 @@
 
 #~ msgid ""
+#~ "<html>The merged nodes are members in one ore more relations. Please "
+#~ "decide whether your want to <strong>keep</strong> these memberships for "
+#~ "the target node or whether you want to <strong>remove</strong> them."
+#~ "<br>The default is to <strong>keep</strong> them: the target node will "
+#~ "take the place of the original node in the membership.</html>"
+#~ msgstr ""
+#~ "<html>Объединённые точки являются членами одного или более отношений. "
+#~ "Пожалуйста решите, хотите ли вы  <strong>сохранить</strong> этих "
+#~ "участников для полученной точки или вы хотите <strong>удалить</strong> их."
+#~ "<br>По умолчанию, они будут <strong>сохранены</strong>: полученная точка "
+#~ "будет на месте оригинальной точки отношения.</html>"
+
+#~ msgid ""
+#~ "<html>The combined ways are members in one ore more relations. Please "
+#~ "decide whether your want to <strong>keep</strong> these memberships for "
+#~ "the combined way or whether you want to <strong>remove</strong> them."
+#~ "<br>The default is to <strong>keep</strong> them: the combined way will "
+#~ "take the place of the original way in the membership.</html>"
+#~ msgstr ""
+#~ "<html>Комбинированные линии являются участниками одного или более "
+#~ "отношений. Пожалуйста решите, хотите ли вы <strong>сохранить</strong> "
+#~ "этих участников для комбинированной линии или вы хотите <strong>удалить</"
+#~ "strong> их.<br>По умолчанию они будут <strong>сохранены</strong>: "
+#~ "комбинированная линия будет на месте оригинальной линии отношения.</html>"
+
+#~ msgid "Not yet tagged images"
+#~ msgstr "Картинки без тегов"
+
+#~ msgid "Auto-tag source added:"
+#~ msgstr "Добавлен источник авто-тега:"
+
+#~ msgid ""
 #~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
 #~ "import EXIF geotagged pictures."
@@ -29994,4 +30770,9 @@
 #~ "линию; объединить полигоны; перейти в указанную точку."
 
+#~ msgid "User with the same uid but different name found"
+#~ msgstr ""
+#~ "Найден пользователь с тем же идентификатором пользователя, но с другим "
+#~ "именем"
+
 #~ msgid "null detected in node list"
 #~ msgstr "обнаружено значение null в списке точек"
@@ -29999,2 +30780,12 @@
 #~ msgid "unexpected null value for n.getEastNorth(). id of n is"
 #~ msgstr "неожиданное значение null для n.getEastNorth(). id из n"
+
+#~ msgid ""
+#~ "<html><p>There the the error information provided below should already "
+#~ "be<br>filled out for you. Please include information on how to "
+#~ "reproduce<br>the error and try to supply as much detail as possible.</p></"
+#~ "html>"
+#~ msgstr ""
+#~ "<html><p>Информация об ошибке уже добавлена ниже<br>для облегчения "
+#~ "работы. Вы только опишите подробно, то, как возникла эта<br>ошибка и "
+#~ "постарайтесь сделать это поподробнее.</p></html>"