Ignore:
Timestamp:
2009-11-24T10:42:28+01:00 (15 years ago)
Author:
stoecker
Message:

i18n update

File:
1 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/i18n/po/ru.po

    r18656 r18773  
    88"Project-Id-Version: josm\n"
    99"Report-Msgid-Bugs-To: \n"
    10 "POT-Creation-Date: 2009-11-17 17:14+0100\n"
    11 "PO-Revision-Date: 2009-11-13 20:06+0000\n"
     10"POT-Creation-Date: 2009-11-24 10:29+0100\n"
     11"PO-Revision-Date: 2009-11-23 19:23+0000\n"
    1212"Last-Translator: Calibrator <Unknown>\n"
    1313"Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
    … …  
    1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
    1818"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
    19 "X-Launchpad-Export-Date: 2009-11-17 16:06+0000\n"
     19"X-Launchpad-Export-Date: 2009-11-24 08:52+0000\n"
    2020"X-Generator: Launchpad (build Unknown)\n"
    2121"X-Poedit-Country: RUSSIAN FEDERATION\n"
    … …  
    3030#: ../core/src/org/openstreetmap/josm/Main.java:217
    3131#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
    32 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
     32#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439
    3333#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
    3434#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
    3535#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
    36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
     36#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185
    3737#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
    3838msgid "Help"
    3939msgstr "Справка"
    4040
    41 #: ../core/src/org/openstreetmap/josm/Main.java:431
     41#: ../core/src/org/openstreetmap/josm/Main.java:430
    4242#, java-format
    4343msgid "Ignoring malformed URL: \"{0}\""
    4444msgstr "Игнорируется неверная ссылка: \"{0}\""
    4545
    46 #: ../core/src/org/openstreetmap/josm/Main.java:432
    47 #: ../core/src/org/openstreetmap/josm/Main.java:452
     46#: ../core/src/org/openstreetmap/josm/Main.java:431
     47#: ../core/src/org/openstreetmap/josm/Main.java:451
    4848#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
    4949#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
    … …  
    6464#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
    6565#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
    66 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
    67 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
    68 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
     66#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
     67#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
     68#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
    6969#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
    7070#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
    7171#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
    7272#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
    73 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
    74 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
    75 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
    76 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
    77 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
    78 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
    79 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
    80 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379
    81 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
    82 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
     73#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281
     74#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
     75#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
     76#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
     77#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378
     78#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355
     79#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
     80#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739
    8381#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
    8482#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
    … …  
    8684#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
    8785#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
    88 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
    89 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
     86#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
     87#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
    9088#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
    9189#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
    … …  
    9795#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
    9896#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67
    99 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137
     97#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
    10098msgid "Warning"
    10199msgstr "Предупреждение"
    102100
    103 #: ../core/src/org/openstreetmap/josm/Main.java:451
     101#: ../core/src/org/openstreetmap/josm/Main.java:450
    104102#, java-format
    105103msgid "Ignoring malformed file URL: \"{0}\""
    106104msgstr "Игнорирование неправильной ссылки на файл: \"{0}\""
     105
     106#: ../core/src/org/openstreetmap/josm/Main.java:463
     107#: ../core/src/org/openstreetmap/josm/Main.java:471
     108#: ../core/src/org/openstreetmap/josm/Main.java:502
     109#: ../core/src/org/openstreetmap/josm/Main.java:510
     110#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
     111#, java-format
     112msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
     113msgstr "<html>Не удалось прочитать файл ''{0}''.<br> Ошибка: <br>{1}</html>"
    107114
    108115#: ../core/src/org/openstreetmap/josm/Main.java:464
    … …  
    110117#: ../core/src/org/openstreetmap/josm/Main.java:503
    111118#: ../core/src/org/openstreetmap/josm/Main.java:511
    112 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
    113 #, java-format
    114 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
    115 msgstr "<html>Не удалось прочитать файл ''{0}''.<br> Ошибка: <br>{1}</html>"
    116 
    117 #: ../core/src/org/openstreetmap/josm/Main.java:465
    118 #: ../core/src/org/openstreetmap/josm/Main.java:473
    119 #: ../core/src/org/openstreetmap/josm/Main.java:504
    120 #: ../core/src/org/openstreetmap/josm/Main.java:512
    121119#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
    122120#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
    123121#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
    124 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233
     122#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
    125123#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
    126124#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
    … …  
    128126#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
    129127#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
    130 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
    131 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
    132 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
    133 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
     128#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
     129#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
     130#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
     131#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
    134132#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
    135133#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
    … …  
    139137#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
    140138#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90
    141 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
    142 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
    143 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
     139#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137
     140#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390
     141#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
    144142#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
    145 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
    146 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
    147 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
    148 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
    149 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
     143#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
     144#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755
     145#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
     146#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809
     147#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036
    150148#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
    151149#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
    152150#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
    153151#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
    154 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
    155 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
    156 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
    157 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
     152#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
     153#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
     154#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647
     155#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655
    158156#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
    159157#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
    … …  
    177175#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177
    178176#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186
    179 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
     177#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142
    180178#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
    181179#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29
    182 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40
     180#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
     181#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57
     182#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63
     183#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
    183184#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
    184185#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
    … …  
    191192#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287
    192193#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77
    193 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228
    194 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
     194#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236
     195#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433
    195196msgid "Error"
    196197msgstr "Ошибка"
    … …  
    211212#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
    212213#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
     214#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646
    213215#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648
    214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:650
    215216#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
    216217msgid "Java OpenStreetMap Editor"
    … …  
    312313
    313314#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
    314 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
     315#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
    315316#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
    316317#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
    … …  
    319320#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
    320321#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
    321 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
    322 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
    323 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
    324 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
    325 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
     322#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
     323#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
     324#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
     325#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356
     326#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
    326327#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
    327328#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
    328329#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
    329 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
     330#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
    330331#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
    331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
    332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
    333 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
     332#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
     333#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837
     334#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163
    334335#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
    335 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
     336#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363
    336337#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
    337338#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
    338 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
     339#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516
    339340#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
    340341#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
    341342#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
    342343#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
    343 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
     344#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738
    344345#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
    345346#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
    … …  
    357358#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
    358359#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
    359 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
     360#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179
    360361msgid "Cancel"
    361362msgstr "Отмена"
    … …  
    367368"линию или отношение."
    368369
    369 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
     370#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
    370371msgid "Please select the target layer."
    371372msgstr "Пожалуйста выберите целевой слой."
    372373
    373 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
     374#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
    374375msgid "Select target layer"
    375376msgstr "Выбор слоя"
    376377
    377 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
     378#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
    378379#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
    379 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
     380#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465
    380381msgid "Merge"
    381382msgstr "Объединить"
    382383
    383 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
     384#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
    384385#, java-format
    385386msgid ""
    … …  
    390391"</html>"
    391392
    392 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
     393#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
    393394msgid "No target layers"
    394395msgstr "Не выбран слой"
    … …  
    501502#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137
    502503#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
    503 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
     504#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
    504505#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
    505506#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
    506507#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
    507 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
     508#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
    508509#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
    509510#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
    510511#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
    511 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
     512#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
    512513#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
    513514#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
    … …  
    606607#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
    607608#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
    608 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
     609#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
    609610#, java-format
    610611msgid "File: {0}"
    611612msgstr "Файл: {0}"
    612613
    613 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
     614#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
    614615#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
    615616msgid "There are no open changesets"
    616617msgstr "Пакеты правок не открыты"
    617618
    618 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
     619#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
    619620#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
    620621msgid "No open changesets"
    621622msgstr "Нет открытых пакетов правок"
    622623
    623 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
     624#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
    624625#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
    625626msgid "Downloading open changesets ..."
    … …  
    659660"последовательностью точек."
    660661
    661 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
     662#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
    662663#, java-format
    663664msgid "Combine {0} ways"
    664665msgstr "Объединить {0} линии"
    665666
    666 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
     667#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
    667668msgid "Please select at least two ways to combine."
    668669msgstr "Выделите не менее двух линий для объединения."
    … …  
    707708#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382
    708709#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
    709 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
    710 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
    711 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
     710#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282
     711#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856
     712#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
    712713#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
    713714#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
    714 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
     715#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201
    715716#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
    716717#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
    … …  
    729730#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43
    730731#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
     732#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
    731733#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
    732 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
    733734msgid "Overwrite"
    734735msgstr "Перезаписать"
    735736
    736737#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58
    737 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210
     738#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209
    738739msgid "File exists. Overwrite?"
    739740msgstr "Файл уже существует. Перезаписать?"
    … …  
    780781#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
    781782#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
    782 #: ../core/src/org/openstreetmap/josm/command/Command.java:67
     783#: ../core/src/org/openstreetmap/josm/command/Command.java:66
    783784#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
    784785#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
    … …  
    787788#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
    788789#: ../core/src/org/openstreetmap/josm/data/Bounds.java:99
    789 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55
    790 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882
     790#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54
     791#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921
    791792#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56
    792793#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83
    … …  
    802803#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
    803804#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
    804 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
    805 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
    806 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
     805#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482
     806#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
    807807#, java-format
    808808msgid "There were {0} conflicts during import."
    … …  
    830830#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
    831831#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
    832 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
     832#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292
    833833msgid "Duplicate"
    834834msgstr "Дублировать"
    … …  
    852852msgstr "Выйти из программы"
    853853
    854 #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
     854#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235
    855855msgid "All Formats"
    856856msgstr "Все форматы"
    857857
     858#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
    858859#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
    859 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
    860 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288
     860#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
    861861msgid "Export to GPX..."
    862862msgstr "Экспорт в GPX..."
    863863
    864 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
    865 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
     864#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
     865#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
    866866msgid "Export the data to GPX file."
    867867msgstr "Экспортировать данные в GPX файл"
    868868
    869 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
     869#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
    870870msgid "Nothing to export. Get some data first."
    871871msgstr "Нет данных для экспорта. Создайте данные."
    872872
    873 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
     873#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
    874874#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
    875875#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
    876876#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
    877877#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
    878 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
    879 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
     878#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
     879#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297
    880880#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
    881881#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38
    … …  
    883883#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31
    884884#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
    885 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
    886 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
    887 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
    888 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
    889 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
    890 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
    891 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
    892 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297
    893 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312
     885#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872
     886#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913
     887#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915
     888#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32
     889#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34
     890#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66
     891#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
     892#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295
     893#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310
    894894#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
    895895#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75
    … …  
    908908#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21
    909909#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114
    910 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
    911 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
    912 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
    913 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
     910#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
     911#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361
     912#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408
     913#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463
    914914#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
    915915#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
    … …  
    917917#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
    918918#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
    919 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
     919#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76
     920#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117
    920921#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
    921 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
    922922#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223
    923923#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235
    … …  
    940940#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
    941941#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60
    942 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
     942#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111
    943943#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134
    944 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
    945 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
    946 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
     944#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
     945#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
     946#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382
    947947#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53
    948948#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75
    … …  
    954954msgstr "параметр ''{0}'' не должен быть null"
    955955
    956 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
     956#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
    957957#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
    958958#, java-format
    … …  
    960960msgstr "ожидался экземпляр OsmDataLayer или GpxLayer. Получен ''{0}''."
    961961
    962 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
     962#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
    963963msgid "Export GPX file"
    964964msgstr "Экспорт GPX-файла"
    … …  
    11061106#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
    11071107#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
    1108 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434
    1109 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
     1108#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431
     1109#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623
    11101110msgid "New"
    11111111msgstr "Создать"
    … …  
    12431243#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
    12441244#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
    1245 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
     1245#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
    12461246msgid "Paste"
    12471247msgstr "Вставить"
    … …  
    13311331#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
    13321332#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
    1333 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63
    1334 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258
     1333#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
     1334#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
    13351335msgid "Save"
    13361336msgstr "Сохранить"
    13371337
    13381338#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
    1339 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
     1339#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
    13401340msgid "Save the current data."
    13411341msgstr "Сохранить текущие данные."
    … …  
    13921392#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
    13931393#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
    1394 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273
     1394#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
    13951395msgid "Save As..."
    13961396msgstr "Сохранить как..."
    13971397
    13981398#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
    1399 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
     1399#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
    14001400msgid "Save the current data to a new file."
    14011401msgstr "Сохранить текущие данные в новый файл."
    … …  
    14141414"незаконченные объекты."
    14151415
    1416 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
    1417 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
     1416#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
     1417#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43
    14181418msgid "Show Status Report"
    14191419msgstr "Показать отчёт о состоянии"
    14201420
    1421 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
     1421#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
    14221422msgid "Show status report with useful information that can be attached to bugs"
    14231423msgstr ""
    … …  
    14251425"прикрепить к сообщению об ошибке"
    14261426
    1427 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
     1427#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42
    14281428#, java-format
    14291429msgid "Help: {0}"
    14301430msgstr "Справка: {0}"
    14311431
    1432 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
     1432#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
    14331433msgid "Status Report"
    14341434msgstr "Отчёт о состоянии"
    14351435
    1436 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
     1436#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
    14371437msgid "Copy to clipboard and close"
    14381438msgstr "Скопировать в буфер и закрыть"
    14391439
    1440 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
     1440#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
    14411441#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
    1442 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981
     1442#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012
    14431443#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
    14441444#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886
    … …  
    16131613msgstr "Неприкрепленная точка"
    16141614
    1615 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
     1615#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
    16161616#, java-format
    16171617msgid "Dupe into {0} nodes"
    … …  
    16191619
    16201620#. only one changeCommand for a way, else garbage will happen
    1621 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
     1621#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
    16221622#, java-format
    16231623msgid "Dupe {0} nodes into {1} nodes"
    … …  
    16641664#.
    16651665#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
    1666 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944
     1666#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943
    16671667msgid "Download data"
    16681668msgstr "Скачать данные"
    16691669
    1670 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
     1670#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
    16711671msgid "No current dataset found"
    16721672msgstr "Не найден текущий набор данных"
    16731673
    1674 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
     1674#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84
    16751675#, java-format
    16761676msgid "Didn''t find an object with id {0} in the current dataset"
    16771677msgstr "Объект с id {0} не найден в текущем наборе данных"
    16781678
    1679 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
    1680 #, fuzzy
     1679#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
    16811680msgid "Update selection"
    1682 msgstr "Обновить выделенное"
    1683 
    1684 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
     1681msgstr "Обновить выбор"
     1682
     1683#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
    16851684msgid ""
    16861685"Updates the currently selected objects from the server (re-downloads data)"
    … …  
    16891688"заново)"
    16901689
    1691 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
     1690#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96
    16921691msgid "Update Selection"
    16931692msgstr "Обновить выборку"
    16941693
    1695 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
    1696 #, fuzzy
     1694#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
    16971695msgid "There are no selected objects to update."
    1698 msgstr "Не выделены элементы для обновления."
    1699 
    1700 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
     1696msgstr "Нет выбранных объектов для обновления."
     1697
     1698#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128
    17011699msgid "Selection empty"
    17021700msgstr "Выборка пуста"
    17031701
    1704 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
    1705 #, fuzzy
     1702#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154
    17061703msgid "Update objects"
    1707 msgstr "Удалить объекты"
    1708 
     1704msgstr "Обновить объекты"
     1705
     1706#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118
    17091707#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
    1710 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
    17111708msgid "Upload data"
    17121709msgstr "Загрузить данные на сервер"
    17131710
    1714 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
     1711#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118
    17151712msgid "Upload all changes in the active data layer to the OSM server"
    17161713msgstr "Передать все изменения в активном слое на сервер OSM"
    17171714
    1718 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
     1715#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
    17191716#, java-format
    17201717msgid ""
    … …  
    17251722"устранить.</html>"
    17261723
    1727 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
     1724#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
    17281725#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
    17291726#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
    … …  
    17311728msgstr "Нет изменений для загрузки на сервер."
    17321729
    1733 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
     1730#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
    17341731msgid "Nothing to upload. Get some data first."
    17351732msgstr "Нечего загружать. Сначала создайте данные."
    17361733
    1737 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
     1734#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
    17381735#, java-format
    17391736msgid "Synchronize node {0} only"
    17401737msgstr "Синхронизировать только точку {0}"
    17411738
    1742 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
     1739#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
    17431740#, java-format
    17441741msgid "Synchronize way {0} only"
    17451742msgstr "Синхронизировать только линию {0}"
    17461743
    1747 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
     1744#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
    17481745#, java-format
    17491746msgid "Synchronize relation {0} only"
    17501747msgstr "Синхронизировать только отношение {0}"
    17511748
    1752 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
    1753 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
     1749#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
     1750#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
    17541751msgid "Synchronize entire dataset"
    17551752msgstr "Синхронизировать весь набор данных"
    17561753
    1757 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
     1754#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
    17581755#, java-format
    17591756msgid ""
    … …  
    17751772"редактирование.<br></html>"
    17761773
    1777 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
    1778 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
    1779 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
     1774#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
     1775#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
     1776#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377
    17801777msgid "Conflicts detected"
    17811778msgstr "Обнаружены конфликты"
    17821779
    1783 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
     1780#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
    17841781#, java-format
    17851782msgid ""
    … …  
    17951792"продолжите редактирование.<br></html>"
    17961793
    1797 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
     1794#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
    17981795#, java-format
    17991796msgid ""
    … …  
    18071804"пакет правок.</html>"
    18081805
    1809 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
     1806#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
    18101807msgid "Changeset closed"
    18111808msgstr "Пакет правок закрыт"
    18121809
    1813 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
     1810#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350
    18141811msgid "Prepare conflict resolution"
    18151812msgstr "Подготовить устранение конфликта"
    18161813
    1817 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
     1814#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
    18181815#, java-format
    18191816msgid "Click to download all parent ways for node {0}"
    18201817msgstr "Щёлкните, чтобы скачать с сервера все родительские линии для точки {0}"
    18211818
    1822 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
     1819#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
    18231820msgid "Click to cancel and to resume editing the map"
    18241821msgstr "Щёлкните, чтобы отменить и подтвердить правку карты"
    18251822
    1826 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
     1823#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
    18271824#, java-format
    18281825msgid ""
    … …  
    18381835"устранить в диалоге устранения конфликтов.</html>"
    18391836
    1840 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
     1837#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
    18411838msgid "Node still in use"
    18421839msgstr "Точка ещё используется"
    18431840
    1844 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
    1845 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
     1841#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411
     1842#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428
    18461843#, java-format
    18471844msgid "Warning: error header \"{0}\" did not match with an expected pattern"
    … …  
    18501847"образцу"
    18511848
    1852 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
     1849#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523
    18531850msgid "Updating primitive"
    18541851msgstr "Обновление элемента"
    18551852
    1856 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
     1853#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580
    18571854#, java-format
    18581855msgid "Uploading data for layer ''{0}''"
    … …  
    18611858#. we tried to delete an already deleted primitive.
    18621859#.
    1863 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
     1860#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611
    18641861#, java-format
    18651862msgid ""
    … …  
    18701867"снова на сервер, но без этого объекта."
    18711868
    1872 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
     1869#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612
    18731870#, java-format
    18741871msgid "Object ''{0}'' is already deleted. Skipping object in upload."
    … …  
    18771874"сервер."
    18781875
    1879 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
     1876#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629
    18801877#, java-format
    18811878msgid "Uploading {0} objects ..."
    18821879msgstr "Передача объектов на сервер. Кол-во: {0}..."
    18831880
    1884 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
     1881#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649
    18851882#, java-format
    18861883msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
    … …  
    19941991msgstr "Играть медленнее."
    19951992
    1996 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
     1993#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49
    19971994msgid "Downloading GPS data"
    19981995msgstr "Скачивание данных GPS"
    19991996
    2000 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
     1997#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76
    20011998msgid "Downloaded GPX Data"
    20021999msgstr "Скачанные GPX данные"
    20032000
    2004 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
     2001#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
    20052002msgid "Downloading data"
    20062003msgstr "Скачивание данных"
    20072004
    2008 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
     2005#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
    20092006#, java-format
    20102007msgid ""
    … …  
    20142011"{0}"
    20152012
    2016 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
     2013#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
    20172014msgid "No data found in this area."
    20182015msgstr "В этом месте нет данных."
    … …  
    20732070
    20742071#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
    2075 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
     2072#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
    20762073msgid "Errors during Download"
    20772074msgstr "Ошибка во время скачивания"
    20782075
    2079 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
     2076#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
    20802077msgid "Errors during download"
    20812078msgstr "Ошибки при скачивании с сервера"
    … …  
    20952092#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
    20962093#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
    2097 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
     2094#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
    20982095#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
    20992096#, java-format
    … …  
    21012098msgstr "Режим: {0}"
    21022099
    2103 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
     2100#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272
    21042101msgid ""
    21052102"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
    … …  
    21992196
    22002197#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
    2201 #, fuzzy
    22022198msgid "Move a segment along its normal, then release the mouse button."
    2203 msgstr "Нарисуйте прямоугольник желаемых размеров, и отпустите кнопку мыши."
     2199msgstr ""
     2200"Переместите сегмент вдоль его перпендикуляра, затем отпустите кнопку мыши."
    22042201
    22052202#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
    … …  
    22082205
    22092206#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
    2210 #, fuzzy
    22112207msgid ""
    22122208"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
    22132209"its normal."
    2214 msgstr "Перемещайте сегмент линии, чтобы образовать прямоугольник"
     2210msgstr ""
     2211"Переместите сегмент линии, чтобы создать прямоугольник. Ужерживая Ctrl, "
     2212"переместите, сегмент вдоль его перпендикуляра."
    22152213
    22162214#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
    … …  
    22252223#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
    22262224#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
    2227 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352
     2225#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349
    22282226#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
    22292227#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
    … …  
    22442242msgstr[2] "Добавьте или переместите новую виртуальную точку на {0} линий"
    22452243
    2246 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
     2244#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
    22472245msgid "Move elements"
    22482246msgstr "Переместить элементы"
    22492247
    2250 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
     2248#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
    22512249msgid "Move them"
    22522250msgstr "Переместить"
    22532251
    2254 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
     2252#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
    22552253msgid "Undo move"
    22562254msgstr "Отмена перемещения"
    22572255
    2258 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
     2256#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473
    22592257#, java-format
    22602258msgid ""
    … …  
    22672265"часто производится по ошибке. Действительно переместить их?"
    22682266
    2269 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478
     2267#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
    22702268msgid "Always move and don't show dialog again"
    22712269msgstr "Всегда перемещать и больше не показывать этого предупреждения"
    22722270
    2273 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
     2271#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
    22742272msgid "Release the mouse button to select the objects in the rectangle."
    22752273msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике."
    22762274
    2277 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
     2275#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
    22782276msgid ""
    22792277"Release the mouse button to stop moving. Ctrl to merge with nearest node."
    … …  
    22822280"объединения с ближайшей точкой."
    22832281
    2284 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
     2282#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
    22852283msgid "Release the mouse button to stop rotating."
    22862284msgstr "Отпустите кнопку мыши, чтобы прекратить вращение."
    22872285
    2288 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
     2286#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
    22892287msgid ""
    22902288"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
    … …  
    22952293"выделите что-либо другое"
    22962294
     2295#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
    22972296#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
    2298 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
    2299 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
     2297#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418
    23002298msgid "Zoom"
    23012299msgstr "Масштаб"
    23022300
    2303 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
     2301#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
    23042302msgid "Zoom and move map"
    23052303msgstr "Изменять масштаб и двигать карту"
    23062304
    2307 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
     2305#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73
    23082306msgid ""
    23092307"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
    … …  
    23132311"карту, нажав правую кнопку мыши, или Ctrl+вверх/вниз/влево/вправо"
    23142312
     2313#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
    23152314#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
    2316 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
    23172315msgid "Search..."
    23182316msgstr "Поиск..."
    23192317
    2320 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
     2318#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
    23212319#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
    23222320msgid "Search for objects."
    … …  
    23252323#. -- prepare the combo box with the search expressions
    23262324#.
    2327 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
     2325#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
    23282326msgid "Please enter a filter string."
    23292327msgstr "Пожалуйста, введите строку фильтра"
    23302328
    2331 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
     2329#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
    23322330msgid "Please enter a search string."
    23332331msgstr "Пожалуйста, введите строку для поиска."
    23342332
    2335 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83
    2336 #, fuzzy
     2333#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
    23372334msgid "Enter the search expression"
    2338 msgstr "регулярное выражение"
    2339 
    2340 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
     2335msgstr "Введите выражение для поиска"
     2336
     2337#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90
    23412338msgid "replace selection"
    23422339msgstr "заменить выделение"
    23432340
    2344 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
     2341#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
    23452342msgid "add to selection"
    23462343msgstr "добавить к выделению"
    23472344
    2348 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
     2345#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
    23492346msgid "remove from selection"
    23502347msgstr "убрать из выделения"
    23512348
    2352 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
     2349#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
    23532350msgid "find in selection"
    23542351msgstr "найти в выделенном"
    23552352
    2356 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
     2353#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
    23572354msgid "case sensitive"
    23582355msgstr "регистрозависимый"
    23592356
    2360 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
     2357#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
    23612358msgid "regular expression"
    23622359msgstr "регулярное выражение"
    23632360
    2364 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
     2361#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
    23652362msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
    23662363msgstr "<b>Baker Street</b> - 'Baker' и 'Street' в любом ключе или названии."
    23672364
    2368 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
     2365#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
    23692366msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
    23702367msgstr "<b>\"Baker Street\"</b> - 'Baker Street' в любом ключе или названии."
    23712368
    2372 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
     2369#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
    23732370msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
    23742371msgstr "<b>name:Bak</b> - 'Bak' в любом месте названия."
    23752372
    2376 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
     2373#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
    23772374msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
    23782375msgstr "<b>type=route</b> - ключ 'type' с точным значением 'route'."
    23792376
    2380 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
     2377#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
    23812378msgid ""
    23822379"<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
    … …  
    23862383"b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
    23872384
    2388 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
     2385#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
    23892386msgid "<b>-name:Bak</b> - not 'Bak' in the name."
    23902387msgstr "<b>-name:Bak</b> - название не содержит 'Bak'."
    23912388
    2392 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
     2389#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
    23932390msgid "<b>foot:</b> - key=foot set to any value."
    23942391msgstr "<b>foot:</b> - key=foot устанавливает в любых значениях."
    23952392
    2396 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
     2393#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
    23972394msgid "<u>Special targets:</u>"
    23982395msgstr "<u>Специальные цели:</u>"
    23992396
    2400 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
     2397#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
    24012398msgid ""
    24022399"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
    … …  
    24052402"(линия), <b>relation</b>(отношение)"
    24062403
    2407 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126
     2404#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
    24082405msgid "<b>user:</b>... - all objects changed by user"
    24092406msgstr "<b>user:</b>... - все объекты, измененные заданным пользователем"
    24102407
    2411 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
     2408#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126
    24122409msgid "<b>id:</b>... - object with given ID (0 for new objects)"
    24132410msgstr "<b>id:</b>... - объект с данным ID (0 для новых объектов)"
    24142411
    2415 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
     2412#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
    24162413msgid "<b>nodes:</b>... - object with given number of nodes"
    24172414msgstr "<b>точки:</b>... - объект с заданным количеством точек"
    24182415
    2419 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
     2416#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
    24202417msgid ""
    24212418"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
    … …  
    24252422"мин-макс)"
    24262423
    2427 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
     2424#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
    24282425msgid "<b>modified</b> - all changed objects"
    24292426msgstr "<b>modified</b> - все измененные объекты"
    24302427
    2431 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
     2428#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
    24322429msgid "<b>selected</b> - all selected objects"
    24332430msgstr "<b>selected</b> - все выделенные объекты"
    24342431
    2435 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
     2432#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
    24362433msgid "<b>incomplete</b> - all incomplete objects"
    24372434msgstr "<b>incomplete</b> - все незаконченные объекты"
    24382435
    2439 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
     2436#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
    24402437msgid "<b>untagged</b> - all untagged objects"
    24412438msgstr "<b>untagged</b> - все объекты без тегов"
    24422439
    2443 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
     2440#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
    24442441msgid ""
    24452442"<b>child <i>expr</i></b> - all children of objects matching the expression"
    … …  
    24482445"выражению"
    24492446
    2450 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
     2447#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
    24512448msgid ""
    24522449"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
    … …  
    24552452"выражению"
    24562453
    2457 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
     2454#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
    24582455msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
    24592456msgstr ""
    … …  
    24612458"«или»"
    24622459
    2463 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
     2460#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
    24642461msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
    24652462msgstr ""
    … …  
    24672464"ключ содержит двоеточие)"
    24682465
    2469 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
     2466#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
    24702467msgid "Use <b>(</b> and <b>)</b> to group expressions"
    24712468msgstr "Используйте <b>(</b> and <b>)</b> для группировки выражений"
    24722469
    2473 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148
     2470#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147
    24742471#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
    24752472#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
    … …  
    24792476msgstr "Фильтр"
    24802477
    2481 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148
     2478#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147
    24822479#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
    24832480msgid "Search"
    24842481msgstr "Поиск"
    24852482
    2486 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
     2483#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
    24872484msgid "Submit filter"
    24882485msgstr "Принять фильтр"
    24892486
    2490 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
     2487#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
    24912488msgid "Start Search"
    24922489msgstr "Начать поиск"
    24932490
    2494 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270
     2491#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
    24952492#, java-format
    24962493msgid "No match found for ''{0}''"
    24972494msgstr "Не найдено совпадений для ''{0}''"
    24982495
    2499 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272
     2496#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271
    25002497#, java-format
    25012498msgid "Nothing added to selection by searching for ''{0}''"
    25022499msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''"
    25032500
    2504 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274
     2501#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273
    25052502#, java-format
    25062503msgid "Nothing removed from selection by searching for ''{0}''"
    25072504msgstr "Ничего не удалено из выделения в результате поиска ''{0}''"
    25082505
    2509 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276
     2506#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275
    25102507#, java-format
    25112508msgid "Nothing found in selection by searching for ''{0}''"
    25122509msgstr "Ничего не найдено в выделенном, при поиске ''{0}''"
    25132510
    2514 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286
     2511#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285
    25152512#, java-format
    25162513msgid "Found {0} matches"
    25172514msgstr "Найдено {0} совпадений"
    25182515
    2519 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
     2516#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313
    25202517msgid "CS"
    25212518msgstr "CS"
    25222519
    2523 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
     2520#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313
    25242521msgid "CI"
    25252522msgstr "CI"
    25262523
    2527 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315
     2524#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
    25282525msgid "RX"
    25292526msgstr "RX"
    … …  
    25402537"{2}"
    25412538
    2542 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176
     2539#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194
    25432540msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
    25442541msgstr ""
    … …  
    25462543"использования: ключ=значение"
    25472544
    2548 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
     2545#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236
    25492546#, java-format
    25502547msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
    25512548msgstr "Ошибка синтаксиса шаблона: Шаблон {0} в {1} недопустим!"
    25522549
    2553 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358
     2550#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382
    25542551#, java-format
    25552552msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
    … …  
    25582555"отношение"
    25592556
    2560 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
     2557#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571
    25612558#, java-format
    25622559msgid "Unexpected token: {0}"
    25632560msgstr "Неожиданный знак: {0}"
    25642561
    2565 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
     2562#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591
    25662563msgid "Missing arguments for or."
    25672564msgstr "Отсутствуют параметры для \"ИЛИ\""
    25682565
    2569 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
     2566#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
    25702567msgid "Missing argument for not."
    25712568msgstr "Отсутствуют параметры для \"НЕ\""
    25722569
    2573 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
     2570#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611
    25742571msgid "Expected closing parenthesis."
    25752572msgstr "Отсутствует закрывающая скобка"
    25762573
    2577 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
     2574#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673
    25782575msgid "Wrong number of parameters for tags operator."
    25792576msgstr "Неверное количество параметров оператора tags."
    25802577
    2581 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
     2578#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675
    25822579#, java-format
    25832580msgid ""
    … …  
    25882585"выходящее за пределы допустимого диапазона, например: tags:1 или tags:2-5"
    25892586
    2590 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
     2587#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685
    25912588msgid "Wrong number of parameters for nodes operator."
    25922589msgstr "Неверное число параметров для оператора точек."
    25932590
    2594 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
     2591#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687
    25952592#, java-format
    25962593msgid ""
    … …  
    26012598"или диапазон, например, точки:10-20"
    26022599
    2603 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
     2600#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
    26042601#, java-format
    26052602msgid "Incorrect value of id operator: {0}. Number is expected."
    … …  
    27082705#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
    27092706#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
    2710 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
     2707#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129
    27112708#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
    2712 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
     2709#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
    27132710#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
    27142711#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
    … …  
    28212818
    28222819#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
    2823 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
     2820#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
    28242821msgid "Double conflict"
    28252822msgstr "Двойной конфликт"
    … …  
    28462843msgstr "Невозможно вернуть команду ''{0}'' потому что слоя ''{1}'' больше нет"
    28472844
    2848 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
     2845#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46
    28492846#, java-format
    28502847msgid "Resolve conflicts in coordinates in {0}"
    … …  
    28522849
    28532850#. should not happen
    2854 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
    2855 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
     2851#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68
     2852#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78
    28562853msgid "Cannot resolve undecided conflict."
    28572854msgstr "не могу устранить нерешенный конфликт"
    … …  
    28642861
    28652862#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
    2866 #, fuzzy
    28672863msgid "At least one object to delete required, got empty collection"
    2868 msgstr "По крайней мере, один удаляемый элемент получил пустую коллекцию"
     2864msgstr ""
     2865"Требуется удалить, по крайней мере, один объект, получена пустая коллекция"
    28692866
    28702867#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
    … …  
    29262923msgstr "Удалить подтверждение"
    29272924
    2928 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
     2925#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46
    29292926#, java-format
    29302927msgid "Resolve conflicts in deleted state in {0}"
    29312928msgstr "Устранить конфликт при удалении {0}"
    2932 
    2933 #. in case #3892 happens again
    2934 #.
    2935 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97
    2936 msgid "null detected in node list"
    2937 msgstr ""
    2938 
    2939 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98
    2940 msgid "unexpected null value for n.getEastNorth(). id of n is"
    2941 msgstr ""
    29422929
    29432930#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121
    … …  
    29732960msgstr "Удаление ссылки из отношения {0}"
    29742961
    2975 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
     2962#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57
    29762963#, java-format
    29772964msgid "Resolve conflicts in member list of relation {0}"
    29782965msgstr "Устранить конфликты в списке участников отношения {0}"
    29792966
    2980 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
     2967#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89
    29812968msgid ""
    29822969"Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
    … …  
    30102997msgstr "Последовательность"
    30112998
    3012 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69
     2999#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66
    30133000#, java-format
    30143001msgid "Resolve {0} tag conflicts in node {1}"
    30153002msgstr "Устранить {0} конфликтов тегов в точке {1}"
    30163003
    3017 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70
     3004#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67
    30183005#, java-format
    30193006msgid "Resolve {0} tag conflicts in way {1}"
    30203007msgstr "Устранить {0} конфликтов тегов в линии {1}"
    30213008
    3022 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71
     3009#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
    30233010#, java-format
    30243011msgid "Resolve {0} tag conflicts in relation {1}"
    30253012msgstr "Устранить {0} конфликтов тегов в отношении {1}"
    30263013
    3027 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62
     3014#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
    30283015#, java-format
    30293016msgid "Undelete {0} primitives"
    … …  
    30453032msgstr "Устранить конфликты версий для отношения {0}"
    30463033
    3047 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
     3034#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
    30483035#, java-format
    30493036msgid "Resolve conflicts in node list of way {0}"
    30503037msgstr "Устранить конфликты в списке точек линии {0}"
    30513038
    3052 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
     3039#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70
    30533040#, java-format
    30543041msgid "Main dataset does not include node {0}"
    … …  
    30923079
    30933080#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
    3094 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
     3081#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
    30953082msgid "New value"
    30963083msgstr "Новое значение"
    … …  
    31373124#: ../core/src/org/openstreetmap/josm/data/Bounds.java:101
    31383125#: ../core/src/org/openstreetmap/josm/data/Bounds.java:103
    3139 #, fuzzy, java-format
     3126#, java-format
    31403127msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
    3141 msgstr "требуется параметр ''{0}'' > 0. Получен {1}"
     3128msgstr "Ожидался параметр ''{0}'' > 0.0, получено {1}"
    31423129
    31433130#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
    … …  
    31463133msgstr "Ошибка: не удается сохранить свойства для ''{0}''"
    31473134
    3148 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
     3135#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393
    31493136#, java-format
    31503137msgid "Malformed config file at lines {0}"
    31513138msgstr "Ошибка в файле конфигурации на строках {0}"
    31523139
    3153 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
     3140#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
    31543141#, java-format
    31553142msgid ""
    … …  
    31603147"не является каталогом."
    31613148
    3162 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
     3149#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405
    31633150#, java-format
    31643151msgid ""
    … …  
    31693156"является каталогом.</html>"
    31703157
    3171 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
     3158#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413
    31723159#, java-format
    31733160msgid ""
    … …  
    31783165"отсутствующий каталог параметров: {0}"
    31793166
    3180 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
     3167#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416
    31813168#, java-format
    31823169msgid ""
    … …  
    31873174"каталог параметров: {0}</html>"
    31883175
    3189 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
     3176#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
    31903177#, java-format
    31913178msgid ""
    … …  
    31953182"параметрами по умолчанию."
    31963183
    3197 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
     3184#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431
    31983185#, java-format
    31993186msgid ""
    … …  
    32043191"параметров по умолчанию."
    32053192
    3206 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
     3193#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439
    32073194#, java-format
    32083195msgid ""
    … …  
    32133200"параметров к состоянию по умолчанию: {0}</html>"
    32143201
    3215 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
     3202#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
    32163203#, java-format
    32173204msgid ""
    … …  
    32223209"резервный<br>{0}<br> а новый будет создан с параметрами по умолчанию.</html>"
    32233210
    3224 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
     3211#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
    32253212#, java-format
    32263213msgid ""
    … …  
    32313218"параметров {0} к состоянию по умолчанию."
    32323219
    3233 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
     3220#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488
    32343221#, java-format
    32353222msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
    32363223msgstr "Ошибка: Неожиданная строка ''{0}'' в файле закладок ''{1}''"
    32373224
    3238 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
     3225#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498
    32393226#, java-format
    32403227msgid ""
    … …  
    33233310
    33243311#. short symbol for South
    3325 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
     3312#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
    33263313msgid "S"
    33273314msgstr "Ю"
    33283315
    33293316#. short symbol for North
    3330 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
     3317#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
    33313318msgid "N"
    33323319msgstr "С"
    33333320
    33343321#. short symbol for West
    3335 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
     3322#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88
    33363323msgid "W"
    33373324msgstr "З"
    33383325
    33393326#. short symbol for East
    3340 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
     3327#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
    33413328msgid "E"
    33423329msgstr "В"
    33433330
    3344 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
    3345 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209
     3331#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103
     3332#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
    33463333#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
    33473334#, java-format
    … …  
    33493336msgstr "Пакет правок {0}"
    33503337
    3351 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
     3338#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184
    33523339#, java-format
    33533340msgid ""
    … …  
    33563343"Невозможно добавить примитив {0} к набору данных, так как он уже присутствует"
    33573344
    3358 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634
     3345#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629
    33593346#, java-format
    33603347msgid ""
    … …  
    33673354"критическая ошибка, но необходимо сохраниться, прежде чем продолжить работу."
    33683355
    3369 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
    3370 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191
     3356#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
     3357#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190
    33713358#, java-format
    33723359msgid "Missing merge target for way with id {0}"
    3373 msgstr ""
    3374 
    3375 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175
     3360msgstr "Отстутствует результат слияния для линии с id {0}"
     3361
     3362#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174
    33763363#, java-format
    33773364msgid "Missing merge target for object with id {0}"
    3378 msgstr ""
    3379 
    3380 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203
    3381 #, fuzzy, java-format
     3365msgstr "Отстутствует результат слияния для объекта с id {0}"
     3366
     3367#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202
     3368#, java-format
    33823369msgid "Missing merge target for node with id {0}"
    3383 msgstr "Отсутствуют параметры для \"НЕ\""
    3384 
    3385 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
    3386 #, fuzzy, java-format
     3370msgstr "Отстутствует результат слияния для точки с id {0}"
     3371
     3372#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217
     3373#, java-format
    33873374msgid "Missing merge target for relation with id {0}"
    3388 msgstr "История для отношения {0}"
    3389 
    3390 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224
     3375msgstr "Отстутствует результат слияния для отношения с id {0}"
     3376
     3377#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222
    33913378#, java-format
    33923379msgid "Missing merge target of type {0} with id {1}"
    3393 msgstr ""
     3380msgstr "Отсутствует результат слияния типа {0} с id {1}"
    33943381
    33953382#. should not happen
    33963383#.
    3397 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256
    3398 #, fuzzy, java-format
     3384#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254
     3385#, java-format
    33993386msgid ""
    34003387"Target object with id {0} and version {1} is visible although source object "
    … …  
    34023389"Keeping target object. "
    34033390msgstr ""
    3404 "Мой элемент с id {0} и версией {1} видимый, хотя чужой элемент с более "
    3405 "низкой версией {2} невидим. Невозможно справиться с этой несовместимостью. "
    3406 "Сохраняю мой элемент. "
     3391"Полученный объект с id {0} и версией {1} видимый, хотя оригинал с более "
     3392"низкой версией {2} не видимый. Это несоответствие невозможно. Полученный "
     3393"объект сохранён. "
    34073394
    34083395#. translators notes must be in front
    … …  
    34593446msgstr "В"
    34603447
    3461 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205
     3448#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235
    34623449#, java-format
    34633450msgid "Expected ID >= 0. Got {0}."
    34643451msgstr "обнаружен id >= 0. Получено {0}"
    34653452
    3466 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337
     3453#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367
    34673454msgid "A primitive with ID = 0 can't be invisible."
    34683455msgstr "Элемент с id=0 не может быть невидимым"
    34693456
    3470 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394
     3457#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424
    34713458#, java-format
    34723459msgid "ID > 0 expected. Got {0}."
    34733460msgstr "обнаружено id > 0. Получено {0}"
    34743461
    3475 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396
     3462#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426
    34763463#, java-format
    34773464msgid "Version > 0 expected. Got {0}."
    34783465msgstr "обнаружена версия > 0. Получено {0}"
    34793466
    3480 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884
     3467#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923
    34813468msgid ""
    34823469"Can''t merge because either of the participating primitives is new and the "
    34833470"other is not"
    34843471msgstr ""
    3485 
    3486 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886
     3472"Слияние невозможно, потому что, один из участвующих элементов новый, а "
     3473"другой нет"
     3474
     3475#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925
    34873476#, java-format
    34883477msgid ""
    34893478"Can''t merge primitives with different ids. This id is {0}, the other is {1}"
    34903479msgstr ""
     3480"Слияние элементов с различными id невозможно. Этот id: {0}, другой же: {1}"
    34913481
    34923482#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37
    … …  
    35123502"несколькими значениями."
    35133503
    3514 #: ../core/src/org/openstreetmap/josm/data/osm/User.java:58
     3504#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59
    35153505msgid "User with the same uid but different name found"
    35163506msgstr ""
    3517 
    3518 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283
    3519 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305
     3507"Найден пользователь с тем же идентификатором пользователя, но с другим именем"
     3508
     3509#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282
     3510#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304
    35203511#, java-format
    35213512msgid "Cannot add node {0} to incomplete way {1}."
    3522 msgstr "невозможно добавить узел {0} к незавершённой линии {1}"
     3513msgstr "невозможно добавить точку {0} к незавершённой линии {1}"
    35233514
    35243515#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54
    … …  
    35263517#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85
    35273518#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125
    3528 #, fuzzy, java-format
     3519#, java-format
    35293520msgid "Parameter ''{0}'' > 0 expected, got {1}"
    3530 msgstr "требуется параметр ''{0}'' > 0. Получен {1}"
     3521msgstr "Ожидался параметр ''{0}'' > 0, получено {1}"
    35313522
    35323523#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
    … …  
    35453536
    35463537#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114
    3547 #, fuzzy, java-format
     3538#, java-format
    35483539msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
    3549 msgstr "Невозможно сравнить элемент с id ''{0}'' и элемент с id ''{1}''"
     3540msgstr "Невозможно сравнить элемент с  ID ''{0}'' и элемент с ID ''{1}''."
    35503541
    35513542#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
    … …  
    36863677msgstr "для_текста"
    36873678
    3688 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
     3679#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640
    36893680#, java-format
    36903681msgid "Error: {0}"
    36913682msgstr "Ошибка: {0}"
    36923683
    3693 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
     3684#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640
    36943685#, java-format
    36953686msgid "Warning: {0}"
    … …  
    37013692
    37023693#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
    3703 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100
    3704 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
     3694#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
     3695#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
    37053696#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
    37063697msgid "node"
    … …  
    37113702
    37123703#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
    3713 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
     3704#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
    37143705#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
    37153706msgid "way"
    … …  
    37203711
    37213712#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100
    3722 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
    3723 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
     3713#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
     3714#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
    37243715#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
    37253716msgid "relation"
    … …  
    37383729
    37393730#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103
    3740 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
    3741 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
     3731#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166
     3732#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
    37423733msgid "background"
    37433734msgstr "фон"
    … …  
    37553746msgstr "Gauss-Laborde Réunion 1947"
    37563747
    3757 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
    3758 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117
    3759 msgid ""
    3760 "IMPORTANT : data positioned far away from\n"
    3761 "the current Lambert zone limits.\n"
    3762 "Do not upload any data after this message.\n"
    3763 "Undo your last action, save your work\n"
    3764 "and start a new layer on the new zone."
    3765 msgstr ""
    3766 "ВАЖНО : данные расположены слишком\n"
    3767 "далеко от текущих границ Lambert зоны.\n"
    3768 "Не загружайте пока никаких данных .\n"
    3769 "Отмените последнее действие, сохраните\n"
    3770 "данные и начните новый слой в новой зоне."
    3771 
    3772 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
     3748#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133
    37733749msgid "Lambert 4 Zones (France)"
    37743750msgstr "Lambert 4 Zones (Франция)"
    37753751
    3776 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
     3752#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240
     3753#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241
     3754#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242
     3755#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172
     3756#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173
     3757#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174
     3758#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175
     3759#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
     3760#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
     3761#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
     3762#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
     3763#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
     3764#, java-format
     3765msgid "{0} ({1} to {2} degrees)"
     3766msgstr ""
     3767
     3768#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243
     3769#, java-format
     3770msgid "{0} (Corsica)"
     3771msgstr ""
     3772
     3773#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
     3774#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188
     3775#, fuzzy
     3776msgid "Lambert CC Zone"
     3777msgstr "Зона Ламберта"
     3778
     3779#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133
    37773780msgid "Lambert CC9 Zone (France)"
    37783781msgstr "Lambert CC9 Zone (Франция)"
    … …  
    37863789msgstr "Проекция Меркатора"
    37873790
    3788 #: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90
     3791#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62
     3792msgid "PUWG (Poland)"
     3793msgstr ""
     3794
     3795#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95
     3796#, fuzzy
     3797msgid "PUWG Zone"
     3798msgstr "Зона UTM"
     3799
     3800#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155
     3801msgid "PUWG 1992 (Poland)"
     3802msgstr ""
     3803
     3804#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208
     3805#, java-format
     3806msgid "PUWG 2000 Zone {0} (Poland)"
     3807msgstr ""
     3808
     3809#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
    37893810msgid "Swiss Grid (Switzerland)"
    37903811msgstr "Швейцарская проекция"
    37913812
    3792 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350
     3813#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351
    37933814msgid "UTM"
    37943815msgstr "UTM"
    37953816
    3796 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391
     3817#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387
    37973818msgid "UTM Zone"
    37983819msgstr "Зона UTM"
    37993820
    3800 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
    3801 msgid "UTM20N Guadeloupe Fort-Marigot 1949"
     3821#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25
     3822#, fuzzy
     3823msgid "Guadeloupe Fort-Marigot 1949"
    38023824msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
    38033825
    3804 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
    3805 msgid "UTM20N Guadeloupe Ste-Anne 1948"
     3826#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26
     3827#, fuzzy
     3828msgid "Guadeloupe Ste-Anne 1948"
    38063829msgstr "UTM20N Guadeloupe Ste-Anne 1948"
    38073830
    3808 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
    3809 msgid "UTM20N Martinique Fort Desaix 1952"
     3831#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27
     3832#, fuzzy
     3833msgid "Martinique Fort Desaix 1952"
    38103834msgstr "UTM20N Martinique Fort Desaix 1952"
     3835
     3836#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381
     3837msgid "UTM 20N (France)"
     3838msgstr ""
     3839
     3840#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393
     3841msgid "UTM20 North Geodesic system"
     3842msgstr ""
    38113843
    38123844#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
    … …  
    38213853msgstr "<html>Невозможно записать закладку.<br>{0}</html>"
    38223854
    3823 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
    3824 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
     3855#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173
     3856#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39
    38253857msgid "Do not show again"
    38263858msgstr "Больше не показывать"
    38273859
    3828 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78
     3860#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
    38293861#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
    38303862#, java-format
    … …  
    38323864msgstr " [id: {0}]"
    38333865
    3834 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92
    3835 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117
    3836 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
     3866#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
     3867#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
     3868#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
    38373869msgid "incomplete"
    38383870msgstr "неполный"
    38393871
    3840 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
     3872#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
    38413873msgid "highway"
    38423874msgstr "дорога"
    38433875
    3844 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
     3876#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
    38453877#: build/trans_presets.java:3186
    38463878msgid "railway"
    38473879msgstr "железная дорога"
    38483880
    3849 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
     3881#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
    38503882msgid "waterway"
    38513883msgstr "водоём"
    38523884
    3853 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
     3885#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
    38543886msgid "landuse"
    38553887msgstr "землепользование"
    38563888
    3857 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139
     3889#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
    38583890#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
    38593891#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
    3860 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
    3861 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
     3892#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
     3893#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
    38623894#, java-format
    38633895msgid "{0} node"
    … …  
    38673899msgstr[2] "{0} точек"
    38683900
    3869 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
     3901#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186
    38703902#, java-format
    38713903msgid "{0} member"
    … …  
    39043936
    39053937#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224
     3938#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
    39063939#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
    3907 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
    39083940msgid "Conflict"
    39093941msgstr "Конфликт"
    … …  
    39133945msgstr "Неизвестный хост"
    39143946
    3915 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
     3947#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
    39163948msgid "Object deleted"
    39173949msgstr "Объект удалён"
    39183950
    3919 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
     3951#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438
    39203952#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
    3921 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
     3953#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184
    39223954#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
    39233955msgid "Show help information"
    … …  
    41264158#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
    41274159#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
    4128 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
     4160#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901
    41294161#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
    41304162#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
    41314163#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
    41324164#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
    4133 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
    4134 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
     4165#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
     4166#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
    41354167#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
    41364168#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
    … …  
    42454277msgstr "Длина создаваемого сегмента линии"
    42464278
    4247 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
     4279#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198
    42484280msgid ""
    42494281"Middle click again to cycle through.<br>Hold CTRL to select directly from "
    … …  
    42534285"<br>Удерживайте CTRL, чтобы выбрать мышкой, напрямую из списка.<hr>"
    42544286
    4255 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291
     4287#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
    42564288msgid "(no object)"
    42574289msgstr "(нет объекта)"
    42584290
    4259 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
     4291#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426
    42604292msgid "User:"
    42614293msgstr "Пользователь:"
    42624294
    4263 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:313
    4264 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:330
     4295#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
     4296#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328
    42654297msgid "Layer not in list."
    42664298msgstr "слоя нет в списке."
    42674299
    4268 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:530
     4300#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528
    42694301#, java-format
    42704302msgid "Layer ''{0}'' must be in list of layers"
    … …  
    43924424msgstr "роль {0} не участвует в паре сравнения {1}"
    43934425
    4394 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
    4395 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
     4426#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100
     4427#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196
    43964428msgid "Properties"
    43974429msgstr "Параметры"
    43984430
    4399 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
    4400 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
    4401 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
    4402 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133
     4431#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105
     4432#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163
     4433#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226
     4434#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
    44034435#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
    44044436msgid "Tags"
    44054437msgstr "Теги"
    44064438
    4407 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
    4408 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
    4409 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140
     4439#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110
     4440#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241
     4441#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
    44104442#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
    44114443msgid "Nodes"
    44124444msgstr "Точки"
    44134445
    4414 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
    4415 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
    4416 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
    4417 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143
     4446#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115
     4447#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236
     4448#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262
     4449#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
    44184450msgid "Members"
    44194451msgstr "Участники"
    44204452
    4421 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
     4453#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
    44224454msgid "No pending tag conflicts to be resolved"
    44234455msgstr "Нет конфликтов тегов"
    44244456
    4425 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
     4457#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167
    44264458#, java-format
    44274459msgid "Tags({0} conflicts)"
    44284460msgstr "Теги ({0} конфликтов)"
    44294461
    4430 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
     4462#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
    44314463#, java-format
    44324464msgid "{0} pending tag conflicts to be resolved"
    44334465msgstr "{0} неустранённых конфликтов тегов"
    44344466
    4435 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
     4467#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175
    44364468msgid "Nodes(resolved)"
    44374469msgstr "Точки (без конфликтов)"
    44384470
    4439 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
     4471#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
    44404472msgid ""
    44414473"Merged node list frozen. No pending conflicts in the node list of this way"
    … …  
    44444476"точек этой линии"
    44454477
    4446 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
     4478#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179
    44474479msgid "Nodes(with conflicts)"
    44484480msgstr "Точки (с конфликтами)"
    44494481
    4450 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
     4482#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
    44514483msgid "Pending conflicts in the node list of this way"
    44524484msgstr "Неустранённые конфликты в списке точек этой линии"
    44534485
    4454 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
     4486#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184
    44554487msgid "Members(resolved)"
    44564488msgstr "Члены (без конфликтов)"
    44574489
    4458 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
     4490#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
    44594491msgid ""
    44604492"Merged member list frozen. No pending conflicts in the member list of this "
    … …  
    44644496"конфликтов в списке участников этого отношения"
    44654497
    4466 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
     4498#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188
    44674499msgid "Members(with conflicts)"
    44684500msgstr "Участники отношений(с конфликтами)"
    44694501
    4470 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
     4502#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
    44714503msgid "Pending conflicts in the member list of this relation"
    44724504msgstr "Неразрешённые конфликты в списке участников этого отношения"
    44734505
    4474 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
     4506#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
    44754507msgid "No pending property conflicts"
    44764508msgstr "Нет актуальных конфликтов свойств"
    44774509
    4478 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
     4510#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
    44794511msgid "Properties(with conflicts)"
    44804512msgstr "Свойства (с конфликтами)"
    44814513
    4482 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
     4514#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
    44834515msgid "Pending property conflicts to be resolved"
    44844516msgstr "Конфликты свойств, ожидающие устранения"
    44854517
    4486 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
     4518#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278
    44874519msgid "Conflict Resolution"
    44884520msgstr "Конфликт в разрешении изображения"
    44894521
    4490 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
    4491 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
     4522#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321
     4523#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373
    44924524#, java-format
    44934525msgid "Parameter current out of range. Got {0}."
    … …  
    44954527"текущее значение параметра вне допустимой области: текущее значение {0}"
    44964528
    4497 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
    4498 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
     4529#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585
     4530#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609
    44994531#, java-format
    45004532msgid "List in role {0} is currently not participating in a compare pair."
    45014533msgstr "Список в роли {0} в настоящий момент не учавствует в сравнении пары."
    45024534
    4503 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
     4535#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758
    45044536#, java-format
    45054537msgid "Unexpected value of parameter ''index''. Got {0}."
    45064538msgstr "недопустимое значение параметра \"index\". Текущее значение {0}"
    45074539
    4508 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
     4540#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772
    45094541#, java-format
    45104542msgid "Item {0} not found in list."
    45114543msgstr "пункт {0} не найден в списке"
    45124544
    4513 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
     4545#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218
    45144546msgid "lock scrolling"
    45154547msgstr "блокировать прокрутку"
    45164548
    4517 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
     4549#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226
    45184550msgid "Compare "
    45194551msgstr "Сравнить "
    45204552
    4521 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
     4553#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261
    45224554#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78
    45234555msgid "My version"
    45244556msgstr "Моя версия"
    45254557
    4526 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
     4558#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262
    45274559msgid "List of elements in my dataset, i.e. the local dataset"
    45284560msgstr "Список элементов в моём наборе данных, то есть локальном наборе данных"
    45294561
    4530 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
     4562#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267
    45314563#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84
    45324564#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
    … …  
    45344566msgstr "Объединённая версия"
    45354567
    4536 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
     4568#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268
    45374569msgid ""
    45384570"List of merged elements. They will replace the my elements when the merge "
    … …  
    45424574"объединении будет принято."
    45434575
    4544 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
     4576#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273
    45454577#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90
    45464578msgid "Their version"
    45474579msgstr "Их версия"
    45484580
    4549 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
     4581#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274
    45504582msgid "List of elements in their dataset, i.e. the server dataset"
    45514583msgstr "Список элементов в их наборе данных, набор данных на сервере"
    45524584
    4553 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
     4585#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406
    45544586msgid "> top"
    45554587msgstr "> наверх"
    45564588
    4557 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
     4589#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408
    45584590msgid "Copy my selected nodes to the start of the merged node list"
    45594591msgstr "Скопировать выделенные точки в начало списка объединённых точек"
    45604592
    4561 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
     4593#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433
    45624594msgid "> bottom"
    45634595msgstr "> вниз"
    45644596
    4565 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
     4597#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435
    45664598msgid "Copy my selected elements to the end of the list of merged elements."
    45674599msgstr "Скопировать выделенные элементы в конец списка объединённых элементов"
    45684600
    4569 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
     4601#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462
    45704602msgid ""
    45714603"Copy my selected elements before the first selected element in the list of "
    … …  
    45754607"объединённых элементов"
    45764608
    4577 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
     4609#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496
    45784610msgid ""
    45794611"Copy my selected elements after the first selected element in the list of "
    … …  
    45834615"списке объединённых элементов"
    45844616
    4585 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
     4617#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525
    45864618msgid ""
    45874619"Copy their selected element to the start of the list of merged elements."
    … …  
    45894621"Скопировать их выделенные элементы в начало списка объединённых элементов"
    45904622
    4591 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
     4623#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547
    45924624msgid "Copy their selected elements to the end of the list of merged elements."
    45934625msgstr ""
    45944626"Скопировать их выделенные элементы в конец списка объединённых элементов"
    45954627
    4596 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
     4628#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569
    45974629msgid ""
    45984630"Copy their selected elements before the first selected element in the list "
    … …  
    46024634"списке объединённых элементов"
    46034635
    4604 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
     4636#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598
    46054637msgid ""
    46064638"Copy their selected element after the first selected element in the list of "
    … …  
    46104642"списке объединённых элементов"
    46114643
    4612 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
     4644#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625
    46134645#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
    46144646msgid "Up"
    46154647msgstr "Вверх"
    46164648
    4617 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
     4649#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627
    46184650msgid "Move up the selected elements by one position."
    46194651msgstr "Поднять выделенные элементы на одну позицию"
    46204652
    4621 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
     4653#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657
    46224654#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
    46234655msgid "Down"
    46244656msgstr "Вниз"
    46254657
    4626 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
     4658#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659
    46274659msgid "Move down the selected entries by one position."
    46284660msgstr "Опустить выделенные элементы на одну позицию"
    46294661
    4630 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
    4631 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
    4632 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
    4633 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
    4634 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
     4662#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689
     4663#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30
     4664#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
     4665#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446
     4666#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636
    46354667#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
    46364668msgid "Remove"
    46374669msgstr "Удалить"
    46384670
    4639 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
     4671#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691
    46404672msgid "Remove the selected entries from the list of merged elements."
    46414673msgstr "Удалить выделенные записи из списка объединённых элементов"
    46424674
    4643 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
    4644 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
     4675#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720
     4676#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757
    46454677msgid "Freeze"
    46464678msgstr "Заблокировать"
    46474679
    4648 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
    4649 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
     4680#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721
     4681#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758
    46504682msgid "Freeze the current list of merged elements."
    46514683msgstr "Заблокировать текущий список объединённых элементов"
    46524684
    4653 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
     4685#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753
    46544686msgid "Unfreeze"
    46554687msgstr "Разблокировать"
    46564688
    4657 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
     4689#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754
    46584690msgid "Unfreeze the list of merged elements and start merging."
    46594691msgstr "Разблокировать список объединённых элементов и начать объединение"
    46604692
    4661 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
     4693#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781
    46624694#, java-format
    46634695msgid ""
    … …  
    46684700"записей</html>"
    46694701
    4670 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
     4702#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786
    46714703#, java-format
    46724704msgid ""
    … …  
    46774709"записей</html>"
    46784710
    4679 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
     4711#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804
    46804712#, java-format
    46814713msgid "My version ({0} entry)"
    … …  
    46854717msgstr[2] "Моя версия ({0} записей)"
    46864718
    4687 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
     4719#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807
    46884720#, java-format
    46894721msgid "Merged version ({0} entry)"
    … …  
    46934725msgstr[2] "Объединённая версия ({0} записей)"
    46944726
    4695 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
     4727#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810
    46964728#, java-format
    46974729msgid "Their version ({0} entry)"
    … …  
    47014733msgstr[2] "Их версия ({0} записей)"
    47024734
    4703 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
    4704 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
     4735#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875
     4736#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79
    47054737#, java-format
    47064738msgid ""
    … …  
    47114743"синхронизированных регулировках."
    47124744
    4713 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
    4714 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
     4745#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890
     4746#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94
    47154747#, java-format
    47164748msgid "Adjustable {0} not registered yet."
    … …  
    47214753msgstr "Узел"
    47224754
    4723 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
     4755#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70
    47244756msgid "Merged nodes not frozen yet. Can't build resolution command."
    47254757msgstr ""
    … …  
    47334765msgstr "Неожиданный индекс столбца. Получено {0}."
    47344766
    4735 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421
     4767#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
    47364768#, java-format
    47374769msgid ""
    … …  
    47424774"html>"
    47434775
    4744 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425
     4776#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423
    47454777msgid "Communication with server failed"
    47464778msgstr "Связь с сервером прервана"
    47474779
    4748 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467
    4749 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
     4780#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465
     4781#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494
    47504782msgid "Yes, undelete them too"
    47514783msgstr "Да, восстановить их тоже"
    47524784
    4753 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
    4754 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
     4785#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466
     4786#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495
    47554787msgid "No, cancel operation"
    47564788msgstr "Нет, отменить действие"
    47574789
    4758 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472
     4790#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
    47594791#, java-format
    47604792msgid ""
    … …  
    47664798"html>"
    47674799
    4768 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477
     4800#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475
    47694801msgid "Undelete additional nodes?"
    47704802msgstr "Восстановить дополнительные точки?"
    47714803
    4772 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
     4804#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499
    47734805#, java-format
    47744806msgid ""
    … …  
    47814813"html>"
    47824814
    4783 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
     4815#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
    47844816msgid "Undelete dependent primitives?"
    47854817msgstr "Восстановить связанные элементы?"
    … …  
    48054837msgstr "Координаты:"
    48064838
    4807 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183
     4839#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182
    48084840msgid "Deleted State:"
    48094841msgstr "Удалён:"
    48104842
    4811 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260
     4843#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258
    48124844msgid "Visible State:"
    48134845msgstr "Видим:"
    48144846
    4815 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340
    4816 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352
    4817 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361
    4818 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370
     4847#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338
     4848#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350
     4849#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359
     4850#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368
    48194851#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
    48204852msgid "(none)"
    48214853msgstr "(отсутствует)"
    48224854
    4823 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354
     4855#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352
    48244856#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77
    48254857msgid "deleted"
    48264858msgstr "удалён"
    48274859
    4828 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
     4860#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354
    48294861msgid "not deleted"
    48304862msgstr "не удалён"
    48314863
    4832 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363
     4864#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361
    48334865msgid "visible (on the server)"
    48344866msgstr "видим (на сервере)"
    48354867
    4836 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
     4868#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363
    48374869msgid "not visible (on the server)"
    48384870msgstr "невидим (на сервере)"
    48394871
    4840 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372
     4872#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370
    48414873msgid "Keep a clone of the local version"
    48424874msgstr "Оставить клон локальной версии"
    48434875
    4844 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
     4876#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372
    48454877msgid "Physically delete from local dataset"
    48464878msgstr "Физически удалить из локального набора данных"
    48474879
    4848 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473
     4880#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471
    48494881msgid "Keep my coordiates"
    48504882msgstr "Оставить мои координаты"
    48514883
    4852 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488
     4884#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486
    48534885msgid "Keep their coordiates"
    48544886msgstr "Оставить их координаты"
    48554887
    4856 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503
     4888#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501
    48574889msgid "Undecide conflict between different coordinates"
    48584890msgstr "Восстановить конфликт между различными координатами"
    48594891
    4860 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518
     4892#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516
    48614893msgid "Keep my deleted state"
    48624894msgstr "Оставить моё состояние \"Удалён\""
    48634895
    4864 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533
     4896#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531
    48654897msgid "Keep their deleted state"
    48664898msgstr "Оставить их состояние \"Удалён\""
    48674899
    4868 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548
     4900#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546
    48694901msgid "Undecide conflict between deleted state"
    48704902msgstr "Восстановить конфликт между состояниями \"Удалён\""
    48714903
    4872 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563
     4904#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561
    48734905msgid "Keep my visible state"
    48744906msgstr "Оставить моё состояние \"Видим\""
    48754907
    4876 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578
     4908#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576
    48774909msgid "Yes, reset the id"
    48784910msgstr "Да, сбросить id"
    48794911
    4880 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579
    4881 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620
    4882 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199
     4912#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
     4913#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
     4914#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207
    48834915msgid "No, abort"
    48844916msgstr "Нет, прервать"
    48854917
    4886 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
     4918#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581
    48874919#, java-format
    48884920msgid ""
    … …  
    48954927"получит новое значение.<br>Вы согласны?</html>"
    48964928
    4897 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590
     4929#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588
    48984930msgid "Reset id to 0"
    48994931msgstr "Сбросить в 0"
    49004932
    4901 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604
     4933#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602
    49024934msgid "Keep their visible state"
    49034935msgstr "Оставить их состояние \"Видим\""
    49044936
    4905 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619
     4937#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617
    49064938msgid "Yes, purge it"
    49074939msgstr "Да, очистить"
    49084940
    4909 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
     4941#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622
    49104942#, java-format
    49114943msgid ""
    … …  
    49164948"согласны?</html>"
    49174949
    4918 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629
     4950#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627
    49194951msgid "Remove from dataset"
    49204952msgstr "Удалить из набора данных"
    49214953
    4922 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643
     4954#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641
    49234955msgid "Undecide conflict between visible state"
    49244956msgstr "Восстановить конфликт между состояниями \"Видим\""
    … …  
    49354967"устранения конфликтов"
    49364968
    4937 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
    4938 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
    4939 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
    4940 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
     4969#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35
     4970#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
     4971#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52
     4972#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
    49414973#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
    49424974#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
    4943 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
    4944 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
     4975#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46
     4976#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59
    49454977msgid "<undefined>"
    49464978msgstr "<не определено>"
    49474979
    4948 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
    4949 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
    4950 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
    4951 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
     4980#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36
     4981#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39
     4982#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53
     4983#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56
    49524984#, java-format
    49534985msgid "The merged dataset will not include a tag with key {0}"
    … …  
    49634995#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
    49644996#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
    4965 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
     4997#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169
    49664998#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
    49674999#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
    49685000#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
    4969 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
    4970 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65
     5001#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
     5002#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64
    49715003#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
    49725004#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
    … …  
    49765008#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
    49775009#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
    4978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
     5010#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200
    49795011#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
    49805012#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
    49815013#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
    4982 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
    4983 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72
     5014#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
     5015#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71
    49845016#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
    49855017#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
    … …  
    50085040msgstr "Их версия (серверный набор данных)"
    50095041
    5010 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
    5011 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
     5042#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255
     5043#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284
    50125044msgid ">"
    50135045msgstr ">"
    50145046
    5015 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
     5047#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
    50165048msgid "Keep the selected key/value pairs from the local dataset"
    50175049msgstr "Оставить выделенные пары ключ/значение из локального набора данных"
    50185050
    5019 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
     5051#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
    50205052msgid "Keep the selected key/value pairs from the server dataset"
    50215053msgstr "Оставить выделенных пары ключ/значение из серверного набора данных"
    50225054
    5023 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
     5055#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378
    50245056msgid "Undecide"
    50255057msgstr "Восстановить конфликт"
    50265058
    5027 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
     5059#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
    50285060msgid "Mark the selected tags as undecided"
    50295061msgstr "Пометить выделенные теги, как неулаженные конфликты"
    50305062
    5031 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
    5032 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
     5063#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
     5064#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
    50335065#, java-format
    50345066msgid "Their dataset does not include a tag with key {0}"
    … …  
    50535085msgstr "Конфликтов не обнаружено"
    50545086
    5055 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
     5087#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348
    50565088#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
    50575089msgid "Cancel conflict resolution"
    50585090msgstr "Отменить устранение конфликтов"
    50595091
    5060 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
     5092#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363
    50615093#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288
    50625094msgid "Apply resolved conflicts"
    50635095msgstr "Применить устранённые конфликты"
    50645096
    5065 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
     5097#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
    50665098#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
    50675099#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
    5068 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
     5100#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096
    50695101msgid "Apply"
    50705102msgstr "Применить"
    50715103
    5072 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
     5104#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170
    50735105#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
    50745106#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
    … …  
    50765108msgstr "ничего"
    50775109
    5078 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
     5110#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174
    50795111#: build/trans_presets.java:2301
    50805112msgid "all"
    … …  
    51675199#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
    51685200#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
    5169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
    5170 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
     5201#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
     5202#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
    51715203#, java-format
    51725204msgid "{0} way"
    … …  
    51785210#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
    51795211#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
    5180 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
     5212#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
    51815213#, java-format
    51825214msgid "{0} relation"
    … …  
    51925224"Позиция {0} за пределами допустимого. Текущее количество участников {1}."
    51935225
    5194 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
     5226#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
    51955227msgid "Remove this relation member from the relation"
    51965228msgstr "Удалить этого участника из отношения"
    51975229
    5198 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
     5230#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
    51995231msgid "Keep"
    52005232msgstr "Сохранить"
    52015233
    5202 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
     5234#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
    52035235msgid "Keep this relation member for the target object"
    52045236msgstr "Сохранить этого участника отношений для получаемого объекта"
    52055237
    5206 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
     5238#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
    52075239msgid "Undecided"
    52085240msgstr "Нерешённый"
    52095241
    5210 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
     5242#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
    52115243msgid "Not decided yet"
    52125244msgstr "Ещё не решено"
    … …  
    52145246#. --- role editing
    52155247#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
    5216 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
     5248#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
    52175249msgid "Role:"
    52185250msgstr "Роль:"
    … …  
    53155347
    53165348#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
    5317 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
     5349#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
    53185350#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
    53195351#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
    53205352#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
    53215353#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
    5322 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84
     5354#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
    53235355#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
    53245356#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
    … …  
    53385370msgstr "Стек команд: {0}"
    53395371
    5340 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
     5372#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
    53415373msgid "Resolve conflicts."
    53425374msgstr "Устранить конфликты."
    53435375
    5344 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332
     5376#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329
    53455377msgid "Resolve"
    53465378msgstr "Устранить"
    53475379
    5348 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333
     5380#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330
    53495381msgid "Open a merge dialog of all selected items in the list above."
    53505382msgstr ""
    … …  
    53525384"объектов."
    53535385
    5354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353
     5386#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350
    53555387#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
    53565388#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106
    … …  
    53595391msgstr "Выделить на карте объекты, выбранные в списке вверху."
    53605392
    5361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170
     5393#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
    53625394msgid "Cancel conflict resolution and close the dialog"
    53635395msgstr "Отменить устранение конфликтов и закрыть диалог"
    53645396
    5365 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204
     5397#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201
    53665398msgid "Apply resolved conflicts and close the dialog"
    53675399msgstr "Применить устранение конфликтов и закрыть диалог"
    53685400
    5369 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205
     5401#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202
    53705402msgid "Apply Resolution"
    53715403msgstr "Применить устранение конфликтов"
    53725404
    5373 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217
     5405#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214
    53745406msgid "Close anyway"
    53755407msgstr "Закрыть в любом случае"
    53765408
    5377 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218
     5409#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215
    53785410msgid "Continue resolving"
    53795411msgstr "Продолжить решение"
    53805412
    5381 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220
     5413#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217
    53825414#, java-format
    53835415msgid ""
    … …  
    53955427"улаживанию конфликтов.</html>"
    53965428
    5397 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228
     5429#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225
    53985430msgid "Conflict not resolved completely"
    53995431msgstr "Конфликт устранён не полностью"
    54005432
    5401 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265
     5433#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262
    54025434msgid "Resolve conflicts"
    54035435msgstr "Устранить конфликты"
    54045436
    5405 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267
     5437#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264
    54065438#, java-format
    54075439msgid "Resolve conflicts for ''{0}''"
    … …  
    54135445
    54145446#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
    5415 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
     5447#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889
    54165448#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
    54175449#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
    5418 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
     5450#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255
    54195451#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
    54205452#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
    … …  
    54815513#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
    54825514#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142
    5483 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
     5515#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512
    54845516#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
    54855517msgid "Reload"
    … …  
    55115543msgstr "Показать список всех загруженных слоёв."
    55125544
    5513 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
     5545#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293
    55145546msgid "Delete the selected layer."
    55155547msgstr "Удалить выделенный слой."
    55165548
    5517 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
     5549#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363
    55185550msgid "Show/Hide"
    55195551msgstr "Показать/скрыть"
    55205552
    5521 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
     5553#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374
    55225554msgid "Toggle visible state of the selected layer."
    55235555msgstr "Показать/скрыть выделенный слой"
    55245556
    5525 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
    5526 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
     5557#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410
     5558#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
    55275559msgid "Activate"
    55285560msgstr "Включить"
    55295561
    5530 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
     5562#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416
    55315563msgid "Activate the selected layer"
    55325564msgstr "Активировать выделенный слой"
    55335565
    5534 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
     5566#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471
    55355567msgid "Merge this layer into another layer"
    55365568msgstr "Объединить этот слой с другим слоем"
    55375569
    5538 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
     5570#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577
    55395571msgid "Move the selected layer one row up."
    55405572msgstr "Переместить выделенный слой вверх."
    55415573
    5542 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
     5574#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596
    55435575msgid "Move the selected layer one row down."
    55445576msgstr "Переместить выделенный слой вниз."
    … …  
    55485580msgstr "Информация о слое"
    55495581
    5550 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
    5551 #, fuzzy, java-format
     5582#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
     5583#, java-format
    55525584msgid "This will change {0} object."
    55535585msgid_plural "This will change up to {0} objects."
    5554 msgstr[0] "Количество изменяемых объектов: {0}"
    5555 msgstr[1] "Это изменит до {0} объектов."
    5556 msgstr[2] "Это изменит до {0} объектов."
    5557 
    5558 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
    5559 #, fuzzy
     5586msgstr[0] "Это изменить {0} объект."
     5587msgstr[1] "Это изменит {0} объекта."
     5588msgstr[2] "Это изменит {0} объектов."
     5589
     5590#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
    55605591msgid "An empty value deletes the tag."
    55615592msgstr "Пустое значение удаляет тег."
    55625593
    5563 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
    5564 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
     5594#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
     5595#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247
    55655596#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
    55665597#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
    … …  
    55695600msgstr "<различные>"
    55705601
    5571 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
    5572 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
     5602#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
     5603#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
    55735604msgid "Change values?"
    55745605msgstr "Изменить значения?"
    55755606
    5576 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
     5607#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269
    55775608#, java-format
    55785609msgid "Change properties of up to {0} object"
    … …  
    55825613msgstr[2] "Изменить параметры {0} объектов"
    55835614
    5584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
     5615#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328
    55855616#, java-format
    55865617msgid "This will change up to {0} object."
    … …  
    55905621msgstr[2] "Это изменит до {0} объектов."
    55915622
    5592 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
     5623#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
    55935624msgid "Please select a key"
    55945625msgstr "Пожалуйста, выберите ключ"
    55955626
    5596 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
     5627#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340
    55975628msgid "Please select a value"
    55985629msgstr "Выберите значение"
    … …  
    56165647msgstr "Член группы"
    56175648
    5618 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
     5649#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569
    56195650msgid "Add Properties"
    56205651msgstr "Добавить параметры"
    56215652
    5622 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
     5653#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791
     5654#, java-format
     5655msgid "Properties: {0} / Memberships: {1}"
     5656msgstr "Свойств: {0} / Участников: {1}"
     5657
     5658#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794
     5659msgid "Properties / Memberships"
     5660msgstr "Параметры / Участники"
     5661
     5662#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836
     5663msgid "Change relation"
     5664msgstr "Изменить отношение"
     5665
     5666#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837
     5667msgid "Delete from relation"
     5668msgstr "Удалить из отношения"
     5669
     5670#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
     5671#, java-format
     5672msgid "Really delete selection from relation {0}?"
     5673msgstr "Вы действительно хотите удалить отмеченное из отношения {0}?"
     5674
     5675#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857
     5676msgid "Delete the selected key in all objects"
     5677msgstr "Удалить выделенный ключ из всех объектов"
     5678
     5679#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
     5680msgid "Delete Properties"
     5681msgstr "Удалить параметры"
     5682
     5683#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890
    56235684msgid "Add a new key/value pair to all objects"
    56245685msgstr "Добавить новую пару ключ/значение для всех объектов"
    56255686
    5626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
    5627 msgid "Edit Properties"
    5628 msgstr "Изменить параметры"
    5629 
    5630 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
     5687#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902
    56315688msgid "Edit the value of the selected key for all objects"
    56325689msgstr "Изменить значение выбранного ключа для всех объектов"
    56335690
    5634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
    5635 #, java-format
    5636 msgid "Properties: {0} / Memberships: {1}"
    5637 msgstr "Свойств: {0} / Участников: {1}"
    5638 
    5639 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
    5640 msgid "Properties / Memberships"
    5641 msgstr "Параметры / Участники"
    5642 
    5643 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
    5644 msgid "Change relation"
    5645 msgstr "Изменить отношение"
    5646 
    5647 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
    5648 msgid "Delete from relation"
    5649 msgstr "Удалить из отношения"
    5650 
    5651 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
    5652 #, java-format
    5653 msgid "Really delete selection from relation {0}?"
    5654 msgstr "Вы действительно хотите удалить отмеченное из отношения {0}?"
    5655 
    5656 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
    5657 msgid "Delete the selected key in all objects"
    5658 msgstr "Удалить выделенный ключ из всех объектов"
    5659 
    5660 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
    5661 msgid "Delete Properties"
    5662 msgstr "Удалить параметры"
    5663 
    56645691#. item "Land use/Quarry" text "Name"
    56655692#. <!-- FIXME: element role not yet supported! -->
     5693#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
    56665694#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
    5667 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84
    5668 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194
     5695#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177
    56695696#: build/trans_presets.java:3151
    56705697msgid "Relations"
    56715698msgstr "Отношения"
    56725699
    5673 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
     5700#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
    56745701msgid "Open a list of all relations."
    56755702msgstr "Показать список всех отношений."
    56765703
    5677 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
     5704#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175
    56785705#, java-format
    56795706msgid "Relations: {0}"
    56805707msgstr "Отношения: {0}"
    56815708
    5682 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348
     5709#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269
    56835710msgid "Open an editor for the selected relation"
    56845711msgstr "Открыть редактор для выбранного отношения"
    56855712
    5686 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
     5713#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310
    56875714msgid "Delete the selected relation"
    56885715msgstr "Удалить выбранное отношение"
    56895716
    5690 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427
     5717#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348
    56915718msgid "Create a new relation"
    56925719msgstr "Создать новое отношение"
    56935720
    5694 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464
    5695 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
     5721#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385
     5722#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289
    56965723msgid "Create a copy of this relation and open it in another editor window"
    56975724msgstr "Создать копию этого отношения и открыть его в другом окне редактора"
    56985725
    5699 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502
     5726#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423
    57005727msgid "Set the current selection to the list of selected relations"
    57015728msgstr "Установить текущий выбор на списке выделенных отношений"
    57025729
    5703 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529
     5730#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450
    57045731msgid "Select the members of all selected relations"
    57055732msgstr "Выделите участников всех выбранных отношений"
    57065733
    5707 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531
     5734#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452
    57085735msgid "Select members"
    57095736msgstr "Выбрать участников"
    57105737
    5711 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558
     5738#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482
    57125739msgid "Download all members of the selected relations"
    57135740msgstr "Скачать с сервера всех участников выделенных отношений"
    57145741
    5715 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559
     5742#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483
    57165743msgid "Download members"
    57175744msgstr "Скачать участников"
    … …  
    57405767
    57415768#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
    5742 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
     5769#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
    57435770#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
    57445771msgid "Selection"
    … …  
    57505777msgstr "Выбор: {0}"
    57515778
    5752 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
     5779#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334
    57535780msgid "Undock the panel"
    57545781msgstr "Отсоединить панель"
    57555782
    5756 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
     5783#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348
    57575784msgid ""
    57585785"Close this panel. You can reopen it with the buttons in the left toolbar."
    … …  
    57615788"панели."
    57625789
    5763 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
     5790#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359
    57645791msgid "Click to minimize/maximize the panel content"
    57655792msgstr "Щёлкните для уменьшения/увеличения содержимого панели"
    … …  
    58475874
    58485875#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
    5849 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
    5850 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
    5851 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
     5876#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447
     5877#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383
     5878#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390
    58525879msgid "Download relation members"
    58535880msgstr "Скачать участников отношений"
    58545881
    58555882#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
    5856 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
     5883#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
    58575884msgid "Conflicts in data"
    58585885msgstr "Конфликт в данных"
    … …  
    58715898
    58725899#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409
    5873 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519
     5900#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518
    58745901#, java-format
    58755902msgid "Downloading relation {0}"
    … …  
    58775904
    58785905#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
    5879 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
     5906#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528
    58805907#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476
    58815908#, java-format
    … …  
    58855912"Исключение: {0}"
    58865913
    5887 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
     5914#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
    58885915msgid "Tags and Members"
    58895916msgstr "Теги и участники"
    58905917
    5891 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
    5892 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
     5918#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
     5919#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
    58935920msgid "Parent Relations"
    58945921msgstr "Родительские отношения"
    58955922
    5896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
     5923#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
    58975924msgid "Child Relations"
    58985925msgstr "Дочерние элементы отношения"
    58995926
    5900 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
     5927#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
    59015928msgid ""
    59025929"<html>There is at least one member in this relation referring<br>to the "
    … …  
    59085935"хотите продолжать с циклическими отношениями?</html>"
    59095936
    5910 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
    5911 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
     5937#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
     5938#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
    59125939msgid "Remove them, clean up relation"
    59135940msgstr "Удалить их, почистить отношение"
    59145941
    5915 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
     5942#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
    59165943msgid "Ignore them, leave relation as is"
    59175944msgstr "Игнорировать их, оставить отношение как есть"
    59185945
    5919 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
     5946#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
    59205947#, java-format
    59215948msgid ""
    … …  
    59285955"участника отношения?</html>"
    59295956
    5930 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
     5957#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
    59315958msgid "Multiple members referring to same primitive"
    59325959msgstr "Несколько участников, относящихся к одному и тому же элементу"
    59335960
    5934 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
     5961#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
    59355962#, java-format
    59365963msgid ""
    … …  
    59435970"''{0}'' будет пропущено.</html>"
    59445971
    5945 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
     5972#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
    59465973msgid ""
    59475974"Add all primitives selected in the current dataset before the first member"
    … …  
    59505977"участником"
    59515978
    5952 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
     5979#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
    59535980msgid ""
    59545981"Add all primitives selected in the current dataset after the last member"
    … …  
    59575984"участника"
    59585985
    5959 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
     5986#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
    59605987msgid ""
    59615988"Add all primitives selected in the current dataset before the first selected "
    … …  
    59655992"выделенным участником"
    59665993
    5967 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
     5994#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
    59685995msgid ""
    59695996"Add all primitives selected in the current dataset after the last selected "
    … …  
    59736000"выделенного участника"
    59746001
    5975 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
     6002#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801
    59766003msgid "Remove all members referring to one of the selected primitives"
    59776004msgstr "Удалить всех участников, относящихся к каждому из выделенных элементов"
    59786005
    59796006#. putValue(NAME, tr("Remove Selected"));
    5980 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
     6007#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804
    59816008msgid "Relation Editor: Remove Selected"
    59826009msgstr "Редактор отношений: удалить выделенное"
    59836010
    5984 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
    5985 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
     6011#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838
     6012#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
    59866013msgid ""
    59876014"Select relation members which refer to primitives in the current selection"
    59886015msgstr "Выделить участников отношения, которые относятся к выбранным элементам"
    59896016
    5990 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
     6017#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848
    59916018#, java-format
    59926019msgid ""
    … …  
    59976024"выделенных элементов"
    59986025
    5999 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
     6026#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
    60006027msgid "Select primitives for selected relation members"
    60016028msgstr "Выделить элементы для выделенных участников отношения"
    60026029
    6003 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
     6030#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892
    60046031msgid "Sort the relation members"
    60056032msgstr "Сортировать участников отношений"
    60066033
    60076034#. putValue(NAME, tr("Sort"));
    6008 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
     6035#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
    60096036msgid "Relation Editor: Sort"
    60106037msgstr "Редактор отношений: сортировать"
    60116038
    6012 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
     6039#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
    60136040msgid "Move the currently selected members up"
    60146041msgstr "Переместить выделенных участников отношения вверх"
    60156042
    60166043#. putValue(NAME, tr("Move Up"));
    6017 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
     6044#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
    60186045msgid "Relation Editor: Move Up"
    60196046msgstr "Редактор отношений: поднять"
    60206047
    6021 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
     6048#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
    60226049msgid "Move the currently selected members down"
    60236050msgstr "Переместить выделенных участников отношения вниз"
    60246051
    60256052#. putValue(NAME, tr("Move Down"));
    6026 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
     6053#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
    60276054msgid "Relation Editor: Move Down"
    60286055msgstr "Редактор отношений: опустить"
    60296056
    6030 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
     6057#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945
    60316058msgid "Remove the currently selected members from this relation"
    60326059msgstr "Удалить отмеченных участников из отношения"
    60336060
    60346061#. putValue(NAME, tr("Remove"));
    6035 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
     6062#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
    60366063msgid "Relation Editor: Remove"
    60376064msgstr "Редактор отношений: удалить"
    60386065
    6039 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
     6066#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
    60406067msgid "Delete the currently edited relation"
    60416068msgstr "Удалить редактируемое отношение"
    60426069
    6043 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
     6070#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048
    60446071msgid "Yes, create a conflict and close"
    60456072msgstr "Да, создать конфликт и закрыть"
    60466073
    6047 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
     6074#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
    60486075msgid "Click to create a conflict and close this relation editor"
    60496076msgstr "Щёлкните, чтобы создать конфликт и закрыть этот редактор отношений"
    60506077
    6051 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
     6078#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
    60526079msgid "No, continue editing"
    60536080msgstr "Нет, продолжить редактирование"
    60546081
    6055 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
     6082#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
    60566083msgid ""
    60576084"Click to to return to the relation editor and to resume relation editing"
    … …  
    60606087"отношения"
    60616088
    6062 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
     6089#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063
    60636090msgid ""
    60646091"<html>This relation has been changed outside of the editor.<br>You can't "
    … …  
    60706097"создать конфликт и закрыть редактор?</html>"
    60716098
    6072 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
     6099#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
    60736100msgid "Conflict in data"
    60746101msgstr "Конфликт в данных"
    60756102
    6076 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
     6103#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080
    60776104#, java-format
    60786105msgid ""
    … …  
    60836110"<br>Пожалуйста, устраните этот конфликт, прежде чем продолжать.</html>"
    60846111
    6085 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
     6112#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094
    60866113msgid "Apply the current updates"
    60876114msgstr "Записать внесённые изменения"
    60886115
    6089 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
     6116#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127
    60906117msgid "Apply the updates and close the dialog"
    60916118msgstr "Применить обновления и закрыть диалог"
    60926119
    6093 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
     6120#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161
    60946121msgid "Cancel the updates and close the dialog"
    60956122msgstr "Отменить обновления и закрыть диалог"
    60966123
    6097 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
     6124#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178
    60986125msgid "Add an empty tag"
    60996126msgstr "Добавить пустой тег"
    61006127
    6101 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
     6128#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191
    61026129msgid "Download all incomplete ways and nodes in relation"
    61036130msgstr "Скачать недостающие части линий и точки, участвующие в отношении"
    61046131
    6105 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
     6132#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193
    61066133msgid "Download Members"
    61076134msgstr "Скачать участников"
    61086135
    6109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
     6136#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
    61106137msgid "Relation Editor: Download Members"
    61116138msgstr "Редактор отношений: скачать участников"
    61126139
    6113 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
     6140#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217
    61146141msgid "Sets a role for the selected members"
    61156142msgstr "Задать роль для выделенных участников"
    61166143
    6117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
     6144#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220
    61186145msgid "Apply Role"
    61196146msgstr "Применить роль"
    61206147
    6121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
     6148#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233
    61226149#, java-format
    61236150msgid ""
    … …  
    61306157"html>"
    61316158
    6132 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
     6159#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237
    61336160msgid "Yes, apply it"
    61346161msgstr "Да, записать"
    61356162
    6136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
     6163#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238
    61376164msgid "No, don't apply"
    61386165msgstr "Нет, не записывать"
    61396166
    6140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
     6167#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
    61416168msgid "Confirm empty role"
    61426169msgstr "Подтвердить пустую роль"
    61436170
    6144 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
     6171#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
    61456172msgid "Edit the relation the currently selected relation member refers to"
    61466173msgstr "Выделенный, при редактировании отношения, участник относится к"
     6174
     6175#. download the relation
     6176#.
     6177#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427
     6178#, fuzzy, java-format
     6179msgid "Downloading relation ''{0}''"
     6180msgstr "Скачивание отношения {0}"
    61476181
    61486182#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190
    … …  
    61526186#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
    61536187#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
    6154 #, fuzzy
    61556188msgid "Zoom to the object the first selected member refers to"
    6156 msgstr ""
    6157 "Приблизиться к элементу, к которому относится первый выделенный участник"
     6189msgstr "Масштабирование приближает к первому выбранному объекту"
    61586190
    61596191#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211
    … …  
    61656197msgstr "Масштабирование отменено, потому что вы не выбрали участника"
    61666198
    6167 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24
     6199#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25
    61686200msgid "Refers to"
    61696201msgstr "Ссылается на"
    6170 
    6171 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32
    6172 msgid "Linked"
    6173 msgstr "Связанные"
    61746202
    61756203#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
    … …  
    61826210msgstr "Ожидалось значение child.getId() > 0. Получено {1}."
    61836211
    6184 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
     6212#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
    61856213#, java-format
    61866214msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
    … …  
    62556283msgstr "Закладки"
    62566284
    6257 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
     6285#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
    62586286msgid "<html>There is currently no download area selected.</html>"
    62596287msgstr ""
    62606288"<html>В настоящий момент не выбрана область для скачивания с сервера.</html>"
    62616289
    6262 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
     6290#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
    62636291#, java-format
    62646292msgid ""
    … …  
    62696297"minlon, maxlat, maxlon): {0}, {1}, {2}, {3}</html>"
    62706298
    6271 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
     6299#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
    62726300msgid "Create bookmark"
    62736301msgstr "Создать закладку"
    62746302
    6275 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
     6303#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
    62766304msgid "Add a bookmark for the currently selected download area"
    62776305msgstr "Добавить закладку к области,  выделенной в настоящий момент"
    62786306
    6279 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
     6307#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187
    62806308msgid ""
    62816309"Currently, there is no download area selected. Please select an area first."
    … …  
    62846312"её."
    62856313
     6314#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
     6315#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250
     6316msgid "Please enter a name for the bookmarked download area."
     6317msgstr ""
     6318"Пожалуйста, введите название закладки для скачиваемой с сервера области."
     6319
    62866320#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
    62876321#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
    6288 msgid "Please enter a name for the bookmarked download area."
    6289 msgstr ""
    6290 "Пожалуйста, введите название закладки для скачиваемой с сервера области."
    6291 
    6292 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
    6293 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
    62946322msgid "Name of location"
    62956323msgstr "Название места"
    62966324
    6297 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
     6325#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212
    62986326msgid "Remove the currently selected bookmarks"
    62996327msgstr "Удалить выделенные закладки"
    63006328
    6301 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
     6329#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238
    63026330msgid "Rename the currently selected bookmark"
    63036331msgstr "Переименовать выделенные закладки"
    63046332
    6305 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
     6333#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
    63066334msgid "min lat"
    63076335msgstr "мин. широта"
    63086336
    6309 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
     6337#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
    63106338msgid "min lon"
    63116339msgstr "мин. долгота"
    63126340
    6313 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
     6341#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
    63146342msgid "max lat"
    63156343msgstr "макс. широта"
    63166344
    6317 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
     6345#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
    63186346msgid "max lon"
    63196347msgstr "макс. долгота"
    63206348
    6321 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
     6349#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
    63226350msgid ""
    63236351"URL from www.openstreetmap.org (you can paste an URL here to download the "
    … …  
    63276355"область)"
    63286356
    6329 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
     6357#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
    63306358msgid "Bounding Box"
    63316359msgstr "Рамка"
    63326360
    6333 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
    6334 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
     6361#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
     6362#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
    63356363#, java-format
    63366364msgid "The string ''{0}'' isn''t a valid double value."
    63376365msgstr "Строка ''{0}'' не является правильным двойным значением."
    63386366
    6339 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
     6367#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
    63406368msgid "Value for latitude in range [-90,90] required."
    63416369msgstr "Значение широты должно быть в пределах [-90,90]."
    63426370
    6343 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
     6371#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
    63446372msgid "Value for longitude in range [-180,180] required."
    63456373msgstr "Значение долготы должно быть в пределах  [-180,180]."
    63466374
    6347 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
     6375#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
    63486376msgid "Paste URL from clipboard"
    63496377msgstr "Вставьте ссылку из буфера"
    63506378
    63516379#. adding the download tasks
    6352 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
     6380#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88
    63536381msgid "Data Sources and Types"
    63546382msgstr "Источники и типы данных"
    63556383
    6356 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
     6384#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
    63576385msgid "OpenStreetMap data"
    63586386msgstr "Данные OpenStreetMap"
    63596387
    6360 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
     6388#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
    63616389msgid "Select to download OSM data in the selected download area."
    63626390msgstr "Пометьте, чтобы скачать с сервера данные OSM, для выделенной области."
    63636391
    6364 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
     6392#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92
    63656393msgid "Raw GPS data"
    63666394msgstr "Данные GPS"
    63676395
    6368 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
     6396#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
    63696397msgid "Select to download GPS traces in the selected download area."
    63706398msgstr "Пометьте, чтобы скачать с сервера треки GPS, для выделеной области."
    63716399
    6372 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
     6400#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113
    63736401msgid "Download as new layer"
    63746402msgstr "Скачать как новый слой"
    63756403
    6376 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
     6404#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
    63776405msgid ""
    63786406"<html>Select to download data into a new data layer.<br>Unselect to download "
    … …  
    63826410"пометку, чтобы скачать данные с сервера в текущий активный слой.</html>"
    63836411
    6384 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
     6412#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118
    63856413msgid "Download Area"
    63866414msgstr "Область для скачивания"
    63876415
    6388 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
    6389 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
     6416#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166
     6417#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380
    63906418msgid "Download"
    63916419msgstr "Скачать"
    63926420
    6393 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
     6421#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206
    63946422msgid "No area selected yet"
    63956423msgstr "Область ещё не выбрана"
    63966424
    6397 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
     6425#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209
    63986426msgid "Download area too large; will probably be rejected by server"
    63996427msgstr ""
    … …  
    64016429"запрос."
    64026430
    6403 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
     6431#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
    64046432msgid "Download area ok, size probably acceptable to server"
    64056433msgstr "Область для скачивания приемлема по площади."
    64066434
    6407 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
     6435#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
    64086436msgid "Click to close the dialog and to abort downloading"
    64096437msgstr "Нажмите, чтобы закрыть диалог и прервать скачивание с сервера"
    64106438
    6411 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
     6439#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
    64126440msgid "Click do download the currently selected area"
    64136441msgstr "Нажмите, чтобы скачать с сервера выделенную область"
    64146442
    6415 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
     6443#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389
    64166444msgid "Please select a download area first."
    64176445msgstr "Пожалуйста, выделите сначала область для скачивания с сервера."
    64186446
    6419 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
     6447#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398
    64206448#, java-format
    64216449msgid ""
    … …  
    64406468
    64416469#. SAXException does not chain correctly
    6442 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
     6470#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219
    64436471msgid "Null pointer exception, possibly some missing tags."
    64446472msgstr "Пустой указатель исключение, возможно есть отсутствующие теги"
    64456473
    6446 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
     6474#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255
    64476475msgid "Search ..."
    64486476msgstr "Найти ..."
    64496477
    6450 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
     6478#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257
    64516479msgid "Click to start searching for places"
    64526480msgstr "Нажмите, чтобы начать поиск мест"
    64536481
    6454 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
     6482#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296
    64556483msgid "Querying name server"
    64566484msgstr "Запрос на сервер имён"
    64576485
    6458 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
     6486#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324
    64596487msgid "Querying name server ..."
    64606488msgstr "Запрос на сервер имён ..."
    … …  
    71937221#. <key key="type" value="multipolygon" />
    71947222#. <optional>
    7195 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
     7223#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394
    71967224#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
    71977225#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
    7198 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
     7226#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
    71997227#: build/trans_presets.java:78 build/trans_presets.java:114
    72007228#: build/trans_presets.java:154 build/trans_presets.java:191
    … …  
    73677395#. item "Land use/Wood" text "Name"
    73687396#. item "Land use/Forest" text "Name"
    7369 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405
     7397#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402
    73707398#: build/trans_presets.java:361 build/trans_presets.java:660
    73717399#: build/trans_presets.java:800 build/trans_presets.java:1148
    … …  
    73777405msgstr "Тип"
    73787406
    7379 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
     7407#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410
    73807408msgid "Near"
    73817409msgstr "Возле"
    … …  
    74267454msgstr "Браузер справки JOSM"
    74277455
    7428 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189
     7456#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188
    74297457#, java-format
    74307458msgid ""
    … …  
    74457473"статью <a href=\"{3}\">help на английском языке</a>.</p></html>"
    74467474
    7447 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211
     7475#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210
    74487476#, java-format
    74497477msgid ""
    … …  
    74587486"<br><tt>{1}</tt></p></html>"
    74597487
    7460 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313
     7488#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312
    74617489#, java-format
    74627490msgid ""
    … …  
    74677495"сети проблемы, поэтому проверьте<br>ваше интернет-соединение</html>"
    74687496
    7469 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318
     7497#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317
    74707498msgid "Failed to open URL"
    74717499msgstr "Не удалось открыть ссылку"
    74727500
    74737501#. putValue(NAME, tr("Open in Browser"));
    7474 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351
     7502#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350
    74757503msgid "Open the current help page in an external browser"
    74767504msgstr "Открыть текущую страницу справки во внешнем браузере"
    74777505
    74787506#. putValue(NAME, tr("Edit"));
    7479 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363
     7507#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362
    74807508msgid "Edit the current help page"
    74817509msgstr "Править текущую страницу справки"
    74827510
    7483 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370
     7511#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369
    74847512#, java-format
    74857513msgid ""
    … …  
    74917519
    74927520#. putValue(NAME, tr("Reload"));
    7493 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393
     7521#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392
    74947522msgid "Reload the current help page"
    74957523msgstr "Загрузить заново текущую страницу справки"
    74967524
    74977525#. putValue(NAME, tr("Back"));
    7498 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408
     7526#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407
    74997527msgid "Go to the previous page"
    75007528msgstr "Перейти на предыдущую страницу"
    75017529
    75027530#. putValue(NAME, tr("Forward"));
    7503 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428
     7531#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427
    75047532msgid "Go to the next page"
    75057533msgstr "Перейти на следующую страницу"
    75067534
    75077535#. putValue(NAME, tr("Home"));
    7508 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444
     7536#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443
    75097537msgid "Go to the JOSM help home page"
    75107538msgstr "Перейти на начальную страницу справки JOSM"
    75117539
    7512 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475
     7540#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474
    75137541msgid "Warning: bad location in HTML document. Exception was: "
    75147542msgstr ""
    75157543"Предупреждение: плохое расположение в документе HTML. Исключение было: "
    75167544
    7517 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525
     7545#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
    75187546msgid "Failed to open help page. The target URL is empty."
    75197547msgstr "Не удалось открыть справочную страницу. Ссылка пуста."
    75207548
    7521 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526
     7549#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525
    75227550msgid "Failed to open help page"
    75237551msgstr "Не удалось открыть справочную страницу"
    … …  
    75407568msgstr "Долгота: "
    75417569
    7542 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137
     7570#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136
    75437571msgid "Coordinates"
    75447572msgstr "Координаты"
    … …  
    76047632
    76057633#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65
    7606 #, fuzzy, java-format
     7634#, java-format
    76077635msgid "Parameter ''{0}'' > 0 expected. Got {1}."
    7608 msgstr "требуется параметр ''{0}'' > 0. Получен {1}"
     7636msgstr "Ожидался параметр ''{0}'' > 0. Получено {1}."
    76097637
    76107638#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
    7611 #, fuzzy, java-format
     7639#, java-format
    76127640msgid "id in parameter ''{0}'' > 0 expected, got {1}."
    7613 msgstr "требуется параметр id ''{0}'' > 0. Получен {1}"
     7641msgstr "ожидался id in parameter ''{0}'' > 0, получено {1}."
    76147642
    76157643#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128
    … …  
    76347662
    76357663#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
    7636 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
     7664#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77
    76377665#, java-format
    76387666msgid "Node {0}"
    76397667msgstr "Точка {0}"
    76407668
     7669#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195
     7670msgid "Zoom to node"
     7671msgstr "Приблизиться к точке"
     7672
    76417673#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
    7642 #, fuzzy
    7643 msgid "Zoom to node"
    7644 msgstr "Приблизиться к проблеме"
    7645 
    7646 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197
    76477674msgid "Zoom to this node in the current data layer"
    7648 msgstr ""
     7675msgstr "Приблизиться к этой точке в текущем слое"
     7676
     7677#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241
     7678msgid "Show history"
     7679msgstr "Показать историю"
    76497680
    76507681#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242
    7651 #, fuzzy
    7652 msgid "Show history"
    7653 msgstr "Загрузить историю"
    7654 
    7655 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243
    76567682msgid "Open a history browser with the history of this node"
    7657 msgstr ""
    7658 
    7659 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
     7683msgstr "Открыть историю этой точки с помощью браузера"
     7684
     7685#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78
    76607686#, java-format
    76617687msgid "Way {0}"
    76627688msgstr "Линия {0}"
    76637689
    7664 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
     7690#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
    76657691#, java-format
    76667692msgid "Relation {0}"
    … …  
    76697695#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36
    76707696#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60
    7671 #, fuzzy
    76727697msgid "not present"
    7673 msgstr "Сортировать меню заготовок"
     7698msgstr "не существует"
    76747699
    76757700#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
    … …  
    76877712#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
    76887713#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
    7689 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
    7690 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
    7691 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
     7714#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
     7715#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
    76927716#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
    76937717#: build/trans_presets.java:335 build/trans_presets.java:336
    … …  
    77157739
    77167740#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
    7717 #, fuzzy, java-format
     7741#, java-format
    77187742msgid ""
    77197743"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
    77207744msgstr ""
     7745"<html>Версия <strong>{0}</strong> в настоящий момент отредактирована в слое "
     7746"''{1}''</html>"
     7747
     7748#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96
     7749#, java-format
     7750msgid ""
     7751"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
     7752msgstr ""
    77217753"<html>Версия <strong>{0}</strong> Создано на <strong>{1}</strong></html>"
    77227754
    7723 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96
    7724 #, java-format
    7725 msgid ""
    7726 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
    7727 msgstr ""
    7728 "<html>Версия <strong>{0}</strong> Создано на <strong>{1}</strong></html>"
    7729 
    77307755#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
    7731 #, fuzzy
    77327756msgid "anonymous"
    7733 msgstr "<анонимный>"
     7757msgstr "анонимный"
    77347758
    77357759#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
    … …  
    77577781
    77587782#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
    7759 #, fuzzy, java-format
     7783#, java-format
    77607784msgid "Version {0} in editor"
    7761 msgstr "Версия {0}"
     7785msgstr "Версия {0} в редакторе"
    77627786
    77637787#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
    7764 #, fuzzy
    77657788msgid "[deleted]"
    7766 msgstr "удалён"
     7789msgstr "[удалено]"
    77677790
    77687791#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
    7769 #, fuzzy, java-format
     7792#, java-format
    77707793msgid "Version {0} currently edited in data layer ''{1}''"
    7771 msgstr "Версия {0} дата создания: {1} автор: {2}"
     7794msgstr "Версия {0} в настоящий момент отредактирована в слое данных ''{1}''"
    77727795
    77737796#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20
    … …  
    78217844msgstr "Закрытие пакета правок {0}"
    78227845
    7823 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
    7824 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
     7846#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142
     7847#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926
    78257848msgid "Launch a file chooser to select a file"
    78267849msgstr "Открыть диалог выбора файла"
    78277850
    7828 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148
     7851#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146
    78297852msgid "Select filename"
    78307853msgstr "Выберите имя файла"
    … …  
    80758098#. item "Water/Water/River" text "Name"
    80768099#. item "Transport/Railway/Bus Guideway" check "Embankment"
    8077 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
     8100#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
    80788101#: build/trans_presets.java:79 build/trans_presets.java:96
    80798102#: build/trans_presets.java:115 build/trans_presets.java:134
    … …  
    80968119msgstr "Слой"
    80978120
    8098 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29
     8121#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28
    80998122msgid "Should upload?"
    81008123msgstr "Следует загрузить на сервер?"
    81018124
    8102 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37
     8125#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36
    81038126msgid "Should save?"
    81048127msgstr "Следует сохранить?"
    81058128
    8106 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45
     8129#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44
    81078130msgid "Filename"
    81088131msgstr "Имя файла"
    81098132
    8110 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
     8133#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
    81118134#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203
    81128135msgid "Upload"
    … …  
    81238146
    81248147#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
    8125 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870
    8126 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
    8127 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
     8148#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
     8149#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939
     8150#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969
    81288151msgid "Tags of new changeset"
    81298152msgstr "Теги нового пакета правок"
    … …  
    81698192msgstr[2] "Удалить {0} объектов:"
    81708193
    8171 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
     8194#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483
    81728195msgid "Upload Changes"
    81738196msgstr "Загрузить изменения на сервер"
    81748197
    8175 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474
     8198#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485
    81768199msgid "Upload the changed primitives"
    81778200msgstr "Загрузить на сервер изменённые элементы"
    81788201
    8179 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
     8202#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491
    81808203msgid "Please enter a comment for this upload changeset (min. 3 characters)"
    81818204msgstr ""
    … …  
    81838206"(мин. 3 символа)"
    81848207
    8185 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
     8208#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
    81868209msgid "Illegal upload comment"
    81878210msgstr "неверный комментарий загрузки на сервер"
    81888211
    8189 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507
     8212#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518
    81908213msgid "Cancel the upload and resume editing"
    81918214msgstr "Отменить загрузку на сервер и продолжить редактирование"
    81928215
    8193 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614
     8216#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624
    81948217msgid "Upload all changes in one request"
    81958218msgstr "Загрузить все изменения на сервер одним запросом"
    81968219
    8197 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
     8220#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625
    81988221msgid ""
    81998222"Enable to upload all changes in one request, disable to use one request per "
    … …  
    82038226"отключите, чтобы делать отдельный запрос для каждого изменённого элемента"
    82048227
    8205 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625
     8228#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635
    82068229msgid "Provide a brief comment for the changes you are uploading:"
    82078230msgstr "Прокомментируйте данные, загружаемые на сервер:"
    82088231
    8209 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627
     8232#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637
    82108233msgid "Enter an upload comment (min. 3 characters)"
    82118234msgstr "Введите комментарий для загрузки на сервер (мин. 3 символа)"
    82128235
    8213 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685
     8236#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695
    82148237msgid "Open a new changeset"
    82158238msgstr "Открыть новый пакет правок"
    82168239
    8217 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686
     8240#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696
    82188241msgid "Open a new changeset and use it in the next upload"
    82198242msgstr ""
    82208243"Открыть новый пакет правок и использовать его в следующей загрузке на сервер"
    82218244
    8222 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693
     8245#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703
    82238246msgid "Use an open changeset"
    82248247msgstr "Использовать открытый пакет правок"
    82258248
    8226 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694
     8249#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704
    82278250msgid "Upload data to an already opened changeset"
    82288251msgstr "Загрузить данные на сервер в уже открытый пакет правок"
    82298252
    8230 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734
     8253#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744
    82318254msgid "Close changeset after upload"
    82328255msgstr "Закрыть пакет правок после загрузки на сервер"
    82338256
    8234 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735
     8257#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745
    82358258msgid "Select to close the changeset after the next upload"
    82368259msgstr ""
    82378260"Выбрать, какой пакет правок надо закрыть, после следующей загрузки на сервер"
    82388261
    8239 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926
    8240 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
     8262#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957
     8263#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981
    82418264#, java-format
    82428265msgid "Tags of changeset {0}"
    … …  
    82448267
    82458268#. putValue(NAME, tr("Reload"));
    8246 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969
     8269#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000
    82478270msgid "Load the list of your open changesets from the server"
    82488271msgstr "Загрузите с сервера список открытых вами пакетов правок"
    82498272
    8250 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983
     8273#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014
    82518274msgid "Close the currently selected open changeset"
    82528275msgstr "Закрыть открытый пакет правок, выбранный в настоящий момент"
    82538276
    8254 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035
    8255 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
    8256 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
    8257 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632
     8277#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066
     8278#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
     8279#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
     8280#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639
    82588281#, java-format
    82598282msgid "Changeset ID > 0 expected. Got {0}."
    … …  
    83038326msgstr "Продолжить загрузку на сервер"
    83048327
    8305 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
     8328#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
    83068329#, java-format
    83078330msgid "Images for {0}"
    83088331msgstr "Изображения для {0}"
    83098332
    8310 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
     8333#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
    83118334msgid "Read GPX..."
    83128335msgstr "Прочесть GPX"
    83138336
    8314 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
     8337#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
    83158338#, java-format
    83168339msgid "No time for point {0} x {1}"
    83178340msgstr "Нет указания времени для точки {0} x {1}"
    83188341
    8319 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
     8342#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
    83208343#, java-format
    83218344msgid "Cannot read time \"{0}\" from point {1} x {2}"
    83228345msgstr "Невозможно прочесть время \"{0}\" у точки  {1} x {2}"
    83238346
    8324 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
     8347#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
    83258348#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147
    83268349#, java-format
    … …  
    83288351msgstr "Чтение {0}..."
    83298352
    8330 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
     8353#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354
    83318354msgid "No images with readable timestamps found."
    83328355msgstr "Не найдено изображений с информацией о времени."
    83338356
    8334 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
     8357#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413
    83358358#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276
    83368359msgid "Geotagged Images"
    83378360msgstr "Изображения с данными о местоположении"
    83388361
    8339 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
     8362#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598
    83408363#, java-format
    83418364msgid "GPS start: {0}"
    83428365msgstr "Начало GPS: {0}"
    83438366
    8344 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
     8367#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599
    83458368#, java-format
    83468369msgid "GPS end: {0}"
    83478370msgstr "Конец GPS: {0}"
    83488371
    8349 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
     8372#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
    83508373#, java-format
    83518374msgid "current delta: {0}s"
    83528375msgstr "текущая разница: {0} с."
    83538376
    8354 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
     8377#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
    83558378msgid "timezone difference: "
    83568379msgstr "разница в часовых поясах: "
    83578380
    8358 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
     8381#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628
    83598382#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
    83608383msgid "image"
    … …  
    83648387msgstr[2] "изображений"
    83658388
    8366 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
     8389#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628
    83678390#, java-format
    83688391msgid "{0} within the track."
    83698392msgstr "{0} в пределах трека"
    83708393
    8371 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
     8394#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
    83728395msgid "Sync clock"
    83738396msgstr "Синхронизация часов"
    83748397
    8375 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
     8398#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698
    83768399#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
    83778400#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
    … …  
    83798402msgstr "Изображения JPEG (*.jpg)"
    83808403
    8381 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
     8404#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745
    83828405#, java-format
    83838406msgid "The date in file \"{0}\" could not be parsed."
    83848407msgstr "Невозможно прочесть дату из файла \"{0}\""
    83858408
    8386 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
     8409#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
    83878410#, java-format
    83888411msgid "There is no EXIF time within the file \"{0}\"."
    83898412msgstr "EXIF файла \"{0}\" не содержит информации о времени."
    83908413
    8391 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
     8414#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761
    83928415msgid "Image"
    83938416msgstr "Изображение"
    83948417
    8395 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
     8418#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763
    83968419msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
    83978420msgstr "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)"
    83988421
    8399 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
     8422#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
    84008423msgid "GPS unit timezone (difference to photo)"
    84018424msgstr "Часовой пояс GPS объекта (отличается от фотографии)"
    84028425
    8403 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
     8426#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778
    84048427msgid "Synchronize Time with GPS Unit"
    84058428msgstr "Синхронизировать время с GPS приёмником"
    84068429
    8407 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
    8408 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
     8430#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
     8431#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808
    84098432msgid "Time entered could not be parsed."
    84108433msgstr "Введённое время невозможно использовать"
    … …  
    84948517
    84958518#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
    8496 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
     8519#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
    84978520#, java-format
    84988521msgid "Description: {0}"
    … …  
    85478570msgstr[2] "{0} путевых точек"
    85488571
    8549 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753
     8572#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752
    85508573#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
    85518574msgid "Convert to data layer"
    85528575msgstr "Преобразовать в слой данных"
    85538576
    8554 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
     8577#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
    85558578msgid ""
    85568579"<html>Upload of unprocessed GPS data as map data is considered harmful."
    … …  
    85608583"считается вредоносной.<br>Если хотите загрузить треки, ознакомьтесь с этим:"
    85618584
    8562 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
     8585#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
    85638586#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
    85648587msgid "http://www.openstreetmap.org/traces"
    85658588msgstr "http://www.openstreetmap.org/traces"
    85668589
    8567 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
    8568 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630
     8590#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785
     8591#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
    85698592#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88
    85708593#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
    … …  
    85748597msgstr "Преобразовано из: {0}"
    85758598
    8576 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808
    8577 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834
    8578 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932
     8599#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807
     8600#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833
     8601#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931
    85798602msgid "Download from OSM along this track"
    85808603msgstr "Скачать с OSM данные вдоль этого трека"
    85818604
    8582 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
     8605#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815
    85838606msgid "Download everything within:"
    85848607msgstr "Скачать всё в пределах:"
    85858608
    8586 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
     8609#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
    85878610#, java-format
    85888611msgid "{0} meters"
    85898612msgstr "{0} метров"
    85908613
    8591 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
     8614#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
    85928615msgid "Maximum area per request:"
    85938616msgstr "Максимальная область для одного запроса:"
    85948617
    8595 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
     8618#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
    85968619#, java-format
    85978620msgid "{0} sq km"
    85988621msgstr "{0} кв. км."
    85998622
    8600 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
     8623#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924
    86018624#, java-format
    86028625msgid ""
    … …  
    86078630"Продолжить?</html>"
    86088631
    8609 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036
     8632#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035
    86108633msgid "No GPX track available in layer to associate audio with."
    86118634msgstr "На слое отсутствует трек GPX, чтобы наложить звук."
    86128635
    8613 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205
     8636#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204
    86148637msgid ""
    86158638"Some waypoints with timestamps from before the start of the track or after "
    … …  
    86198642"будут пропущены или перенесены в начало трека."
    86208643
    8621 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212
     8644#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211
    86228645msgid ""
    86238646"Some waypoints which were too far from the track to sensibly estimate their "
    … …  
    86278650"проигнорированы при рассчете времени."
    86288651
    8629 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
     8652#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
    86308653#, java-format
    86318654msgid "Data Layer {0}"
    86328655msgstr "Слой данных {0}"
    86338656
    8634 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
     8657#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
    86358658msgid "outside downloaded area"
    86368659msgstr "вне области для скачивания"
    86378660
    8638 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
     8661#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
    86398662#, java-format
    86408663msgid "version {0}"
    86418664msgstr "версия {0}"
    86428665
    8643 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
     8666#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
    86448667msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
    86458668msgstr ""
    86468669"Внимание: совместное использование данных версий 0.6 и 0.5 в версии 0.5"
    86478670
    8648 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
     8671#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
    86498672#, java-format
    86508673msgid "There was {0} conflict detected."
    … …  
    86548677msgstr[2] "Обнаружено {0} конфликтов."
    86558678
    8656 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
     8679#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
    86578680#, java-format
    86588681msgid ""
    … …  
    86768699"удалёны на сервере."
    86778700
    8678 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
     8701#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
    86798702#, java-format
    86808703msgid ""
    … …  
    86948717"конфликтов и устраните конфликты вручную."
    86958718
    8696 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
     8719#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
    86978720msgid "Click to close this dialog and continue editing"
    86988721msgstr "Нажмите, чтобы закрыть этот диалог и продолжить правку"
    86998722
    8700 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506
    8701 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511
    8702 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
     8723#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
     8724#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
     8725#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
    87038726#, java-format
    87048727msgid "{0} deleted"
    … …  
    87088731msgstr[2] "{0} удалено"
    87098732
    8710 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
     8733#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
    87118734#, java-format
    87128735msgid "{0} consists of:"
    87138736msgstr "{0} состоит из:"
    87148737
    8715 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
     8738#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
    87168739msgid "unset"
    87178740msgstr "отключено"
    87188741
    8719 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
     8742#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
    87208743#, java-format
    87218744msgid "API version: {0}"
    87228745msgstr "Версия API: {0}"
    87238746
    8724 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
     8747#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
    87258748#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
    87268749msgid "Convert to GPX layer"
    87278750msgstr "Преобразовать в слой GPX"
     8751
     8752#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
     8753msgid "Dataset consistency test"
     8754msgstr ""
     8755
     8756#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730
     8757#, fuzzy
     8758msgid "No problems found"
     8759msgstr "Не найдена линия \"от\""
     8760
     8761#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733
     8762msgid "Following problems found:"
     8763msgstr ""
    87288764
    87298765#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
    … …  
    88328868msgstr "Нет существующих аудио маркеров на этом слое"
    88338869
    8834 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
     8870#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
    88358871msgid "Show/Hide Text/Icons"
    88368872msgstr "Показать/скрыть текст/значки"
    88378873
    8838 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454
     8874#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
    88398875msgid "Toggle visible state of the marker text and icons."
    88408876msgstr "Показать/скрыть текст и значки маркеров."
    … …  
    89008936msgstr "Значение по умолчанию неизвестно (настройка ещё не использовалась)"
    89018937
    8902 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
     8938#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
    89038939#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
    89048940#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660
    … …  
    89068942msgstr "Пожалуйста, выберите ряд для редактирования."
    89078943
    8908 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
     8944#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
    89098945#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
    89108946#, java-format
    … …  
    89128948msgstr "Новое значение для {0}"
    89138949
    8914 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
     8950#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
    89158951#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
    89168952#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
    … …  
    89198955msgstr "Пожалуйста, выберите ряд для удаления."
    89208956
    8921 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
     8957#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268
    89228958msgid "Enter a new key/value pair"
    89238959msgstr "Введите новый ключ и значение"
    … …  
    90579093msgstr "Калибровка звукозаписи"
    90589094
    9059 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
     9095#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
    90609096msgid "Color"
    90619097msgstr "Цвет"
    90629098
    9063 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136
     9099#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
    90649100#, java-format
    90659101msgid "Paint style {0}: {1}"
    90669102msgstr "Стиль рисования {0}:{1}"
    90679103
    9068 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143
     9104#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
    90699105#, java-format
    90709106msgid "Layer: {0}"
    90719107msgstr "Слой: {0}"
    90729108
    9073 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153
     9109#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
    90749110msgid "Choose"
    90759111msgstr "Выбрать"
    90769112
    9077 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160
     9113#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
    90789114#, java-format
    90799115msgid "Choose a color for {0}"
    90809116msgstr "Выберите цвет для {0}"
    90819117
    9082 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168
     9118#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
    90839119msgid "Set to default"
    90849120msgstr "Установить значение по умолчанию"
    90859121
    9086 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
     9122#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
    90879123msgid "Set all to default"
    90889124msgstr "Установить все значения по умолчанию"
    90899125
    9090 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230
     9126#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
    90919127msgid "Colors used by different objects in JOSM."
    90929128msgstr "Цвета, используемые разными объектами в JOSM."
    90939129
    9094 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245
     9130#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
    90959131msgid "Colors"
    90969132msgstr "Цвета"
    … …  
    95399575msgstr "Необходимо перезапустить JOSM, чтобы изменения вступили в силу."
    95409576
    9541 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80
     9577#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79
    95429578msgid "Display coordinates as"
    95439579msgstr "Отображать координаты как"
    95449580
    9545 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83
     9581#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82
    95469582msgid "Projection method"
    95479583msgstr "Тип проекции"
    95489584
    9549 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86
     9585#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85
    95509586msgid "Projection code"
    95519587msgstr "Код проекции"
    95529588
    9553 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89
     9589#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
    95549590msgid "Bounds"
    95559591msgstr "Границы"
    … …  
    95599595msgstr "Картографическая проекция"
    95609596
    9561 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160
     9597#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158
    95629598#, java-format
    95639599msgid "The projection {0} could not be activated. Using Mercator"
    … …  
    96159651msgstr "Горячая клвиша"
    96169652
    9617 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
     9653#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155
    96189654msgid "Active styles"
    96199655msgstr "Активные стили"
    96209656
    9621 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
     9657#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165
    96229658#, java-format
    96239659msgid "Available styles (from {0})"
    96249660msgstr "Доступные стили (из {0})"
    96259661
    9626 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
     9662#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171
    96279663msgid "Icon paths"
    96289664msgstr "Пути к иконкам"
    96299665
    9630 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
     9666#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407
    96319667#, java-format
    96329668msgid "Short Description: {0}"
    96339669msgstr "Краткое описание: {0}"
    96349670
    9635 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
     9671#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407
    96369672#, java-format
    96379673msgid "URL: {0}"
    96389674msgstr "URL: {0}"
    96399675
    9640 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
     9676#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409
    96419677#, java-format
    96429678msgid "Author: {0}"
    96439679msgstr "Автор: {0}"
    96449680
    9645 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
     9681#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
    96469682#, java-format
    96479683msgid "Webpage: {0}"
    96489684msgstr "Веб-страница: {0}"
    96499685
    9650 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
     9686#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
    96519687#, java-format
    96529688msgid "Version: {0}"
    96539689msgstr "Версия: {0}"
    96549690
    9655 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
     9691#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432
    96569692msgid "Add a filename or an URL of an active style"
    96579693msgstr "Добавить название файла или ссылку на активные стили"
    96589694
    9659 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
     9695#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
    96609696msgid "Remove the selected styles from the list of active styles"
    96619697msgstr "Удалить выбранные стили из списка активных стилей"
    96629698
    9663 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
     9699#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468
    96649700msgid "Edit the filename or URL for the selected active style"
    96659701msgstr "Заменить имя файла или ссылку для выбранного активного стиля"
    96669702
    9667 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
     9703#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490
    96689704msgid "Add the selected available styles to the list of active styles"
    96699705msgstr "Добавить выделенные доступные стили к списку активных стилей"
    96709706
    9671 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
     9707#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
    96729708#, java-format
    96739709msgid "Reloads the list of available styles from ''{0}''"
    96749710msgstr "Скачать заново список доступных стилей из ''{0}''"
    96759711
    9676 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
     9712#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624
    96779713msgid "Add a new icon path"
    96789714msgstr "Добавить новый путь к значкам"
    96799715
    9680 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
     9716#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
    96819717msgid "Remove the selected icon paths"
    96829718msgstr "Удалить выделенные пути к значкам"
    96839719
    9684 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
     9720#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658
    96859721msgid "Edit the selected icon path"
    96869722msgstr "Править выделенные пути к значкам"
    96879723
    9688 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
     9724#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703
    96899725#, java-format
    96909726msgid "Loading style sources from ''{0}''"
    96919727msgstr "Загрузить источники стилей из ''{0}''"
    96929728
    9693 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
     9729#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725
    96949730#, java-format
    96959731msgid ""
    … …  
    97009736"<br><br>Подробности (на англ.):<br>{1}</html>"
    97019737
    9702 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
    9703 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
     9738#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
     9739#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797
    97049740#, java-format
    97059741msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
    … …  
    98899925msgstr "Группы модификаторов"
    98909926
    9891 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70
     9927#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
    98929928#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
    98939929msgid "<multiple>"
    98949930msgstr "<множественный>"
    98959931
    9896 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
     9932#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402
    98979933#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
    98989934#, java-format
    … …  
    99039939msgstr[2] "Удалить старые ключи из  {0} объектов"
    99049940
    9905 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
     9941#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134
    99069942msgid "Add a new tag"
    99079943msgstr "Добавить новый тег"
    99089944
    9909 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
     9945#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159
    99109946msgid "Delete the selection in the tag table"
    99119947msgstr "Удалить отмеченное в таблице тегов"
    99129948
    9913 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
     9949#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450
    99149950#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
    99159951msgid "More information about this feature"
    … …  
    99179953
    99189954#. space
    9919 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473
     9955#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472
    99209956msgid "Optional Attributes:"
    99219957msgstr "Дополнительные атрибуты:"
    99229958
    9923 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
     9959#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
    99249960msgid "closedway"
    99259961msgstr "замкнутая линия"
    99269962
    9927 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
     9963#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567
    99289964#, java-format
    99299965msgid "Unknown type: {0}"
    99309966msgstr "Неизвестный тип: {0}"
    99319967
    9932 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647
     9968#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646
    99339969#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
    99349970#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
    … …  
    99399975msgstr "Не удалось прочитать источник заготовок тегов: {0}"
    99409976
    9941 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655
     9977#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
    99429978#, java-format
    99439979msgid "Error parsing {0}: "
    99449980msgstr "Ошибка при разборе {0}: "
    99459981
    9946 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685
     9982#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684
    99479983#, java-format
    99489984msgid "Elements of type {0} are supported."
    99499985msgstr "Элемент типа {0} не поддерживается."
    99509986
    9951 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726
     9987#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725
    99529988#: ../plugins/terracer/src/terracer/TerracerAction.java:98
    99539989#, java-format
    … …  
    99589994msgstr[2] "Изменить {0} объектов"
    99599995
    9960 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729
     9996#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728
    99619997#: ../plugins/terracer/src/terracer/TerracerAction.java:100
    99629998msgid "Nothing selected!"
    99639999msgstr "Ничего не выделено!"
    996410000
    9965 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
     10001#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730
    996610002msgid "Selection unsuitable!"
    996710003msgstr "Неудачный выбор!"
    996810004
    9969 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
     10005#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738
    997010006msgid "Apply Preset"
    997110007msgstr "Применить шаблон"
    997210008
    9973 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814
     10009#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813
    997410010msgid "Change Properties"
    997510011msgstr "Изменить параметры"
    … …  
    998510021msgstr "Группа заготовок {0}"
    998610022
    9987 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
    9988 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
     10023#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41
     10024#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96
    998910025#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
    999010026#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
    … …  
    999310029msgstr "Подключение к серверу OSM..."
    999410030
    9995 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
     10031#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47
    999610032#, java-format
    999710033msgid "Downloading points {0} to {1}..."
    999810034msgstr "Скачивание точек с {0} до {1}..."
     10035
     10036#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33
     10037#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
     10038#, java-format
     10039msgid "Failed to parse date ''{0}'' replied by server."
     10040msgstr "Сервер сообщил о неудавшемся разборе даты ''{0}''."
     10041
     10042#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37
     10043#, fuzzy, java-format
     10044msgid ""
     10045"Unexpected format of error header for conflict in changeset update. Got "
     10046"''{0}''"
     10047msgstr "сервер вернул неожиданный формат id, текущее значение \"{0}\""
    999910048
    1000010049#. SAXException does not chain correctly
    … …  
    1011110160msgstr "Неизвестный режим {0}."
    1011210161
    10113 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
     10162#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115
    1011410163#, java-format
    1011510164msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
    … …  
    1011810167"элемента."
    1011910168
    10120 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312
    10121 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337
     10169#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308
     10170#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333
    1012210171#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
    1012310172#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36
    … …  
    1012710176msgstr "Скачивание данных OSM..."
    1012810177
    10129 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365
     10178#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361
    1013010179#, java-format
    1013110180msgid "Fetching node with id {0} from ''{1}''"
    1013210181msgstr "Выборка точки с id {0} из ''{1}''"
    1013310182
    10134 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366
     10183#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362
    1013510184#, java-format
    1013610185msgid "Fetching way with id {0} from ''{1}''"
    1013710186msgstr "Выборка линии с id {0} из ''{1}''"
    1013810187
    10139 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367
     10188#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363
    1014010189#, java-format
    1014110190msgid "Fetching relation with id {0} from ''{1}''"
    1014210191msgstr "Выборка отношения с id {0} из ''{1}''"
    1014310192
    10144 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373
     10193#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369
    1014510194#, java-format
    1014610195msgid "Server replied with response code 404 for id {0}. Skipping."
    1014710196msgstr "Сервер выдал ошибку 404 для id {0}. Пропускаем"
    1014810197
    10149 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403
     10198#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399
    1015010199#, java-format
    1015110200msgid "Fetching a package of nodes from ''{0}''"
    1015210201msgstr "Выборка пакета точек из ''{0}''"
    1015310202
    10154 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404
     10203#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400
    1015510204#, java-format
    1015610205msgid "Fetching a package of ways from ''{0}''"
    1015710206msgstr "Выборка пакета линий из ''{0}''"
    1015810207
    10159 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405
     10208#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401
    1016010209#, java-format
    1016110210msgid "Fetching a package of relations from ''{0}''"
    1016210211msgstr "Выборка пакета отношений из ''{0}''"
    1016310212
    10164 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416
     10213#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
    1016510214msgid ""
    1016610215"Server replied with response code 404, retrying with an individual request "
    … …  
    1022710276
    1022810277#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
    10229 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
     10278#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322
    1023010279#, java-format
    1023110280msgid "Unexpected format of ID replied by the server. Got ''{0}''."
    … …  
    1024010289"\""
    1024110290
    10242 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
     10291#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314
    1024310292msgid "Creating changeset..."
    1024410293msgstr "Создание пакета правок..."
    1024510294
    10246 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
     10295#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324
    1024710296#, java-format
    1024810297msgid "Successfully opened changeset {0}"
    1024910298msgstr "Успешно открытый пакет правок {0}"
    1025010299
    10251 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
     10300#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
    1025210301msgid "Updating changeset..."
    1025310302msgstr "Обновление пакета правок..."
    1025410303
    10255 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
     10304#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
    1025610305#, java-format
    1025710306msgid "Updating changeset {0}..."
    1025810307msgstr "Обновление пакета правок {0}..."
    1025910308
    10260 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
     10309#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
    1026110310msgid "Closing changeset..."
    1026210311msgstr "Закрытие пакета правок..."
    1026310312
    10264 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408
     10313#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410
    1026510314msgid "No changeset present for diff upload."
    1026610315msgstr "Нет пакетов правок для загрузки отличий"
    1026710316
    10268 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415
     10317#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
    1026910318msgid "Preparing..."
    1027010319msgstr "Подготовка..."
    1027110320
    10272 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420
     10321#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422
    1027310322msgid "Uploading..."
    1027410323msgstr "Загрузка на сервер..."
    1027510324
    10276 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
     10325#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439
    1027710326msgid "Waiting 10 seconds ... "
    1027810327msgstr "Ожидание 10 секунд ... "
    1027910328
    10280 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
     10329#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442
    1028110330#, java-format
    1028210331msgid "Starting retry {0} of {1} in {2} seconds ..."
    1028310332msgstr "Попытка {0} из {1} через {2} секунды..."
    1028410333
    10285 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448
     10334#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450
    1028610335msgid "OK - trying again."
    1028710336msgstr "OK - пробуем ещё раз."
    1028810337
    10289 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521
     10338#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526
    1029010339#, java-format
    1029110340msgid "Starting retry {0} of {1}."
    1029210341msgstr "Попытка {0} из {1}."
    1029310342
    10294 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604
     10343#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611
    1029510344msgid "Current changeset is null. Can't upload data."
    1029610345msgstr "Текущий пакет правок пуст. Невозможно загрузить данные."
    1029710346
    10298 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606
     10347#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613
    1029910348#, java-format
    1030010349msgid "ID of current changeset > 0 required. Current ID is {0}."
    1030110350msgstr "Требуется, чтобы ID текущего пакета правок был > 0. Текущий ID: {0}."
    1030210351
    10303 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634
     10352#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641
    1030410353#, java-format
    1030510354msgid "Open changeset expected. Got closed changeset with id {0}."
    … …  
    1033610385#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
    1033710386#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
    10338 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
     10387#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180
    1033910388#, java-format
    1034010389msgid "Missing mandatory attribute ''{0}''."
    … …  
    1036110410
    1036210411#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
    10363 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
     10412#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176
    1036410413#, java-format
    1036510414msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
    … …  
    1036710416
    1036810417#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
    10369 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
     10418#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
    1037010419#, java-format
    1037110420msgid "Unsupported version: {0}"
    … …  
    1037810427
    1037910428#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
    10380 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
     10429#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313
    1038110430#, java-format
    1038210431msgid "Illegal value for attribute ''uid''. Got ''{0}''."
    … …  
    1054110590msgstr "Файл \"{0}\" не существует"
    1054210591
    10543 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
     10592#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207
    1054410593#, java-format
    1054510594msgid ""
    … …  
    1055010599"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
    1055110600
    10552 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
     10601#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230
    1055310602msgid "Found XML element <nd> not as direct child of element <way>."
    1055410603msgstr "Найден элемент XML <nd>, не являющийся дочерним элементом для <way>."
    1055510604
    10556 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
     10605#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
    1055710606#, java-format
    1055810607msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
    1055910608msgstr "Отсутствует обязательный атрибут ''{0}'' на <nd> линии {1}."
    1056010609
    10561 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
     10610#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
    1056210611#, java-format
    1056310612msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
    1056410613msgstr "Неверное значение атрибута ''ref'' элемента <nd>. Получено {0}."
    1056510614
    10566 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
     10615#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258
    1056710616msgid "Found XML element <member> not as direct child of element <relation>."
    1056810617msgstr ""
    … …  
    1057010619"<relation>."
    1057110620
    10572 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
     10621#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
    1057310622#, java-format
    1057410623msgid "Missing attribute ''ref'' on member in relation {0}."
    1057510624msgstr "Отсутствует атрибут ''ref'' у участника отношений {0}."
    1057610625
    10577 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
     10626#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
    1057810627#, java-format
    1057910628msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
    … …  
    1058110630"Неверное значение атрибута ''ref'' у участника отношения {0}. Получено {1}"
    1058210631
    10583 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
     10632#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273
    1058410633#, java-format
    1058510634msgid "Missing attribute ''type'' on member {0} in relation {1}."
    1058610635msgstr "Отсутствует атрибут ''type'' у участника {0} отношения {1}."
    1058710636
    10588 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
     10637#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
    1058910638#, java-format
    1059010639msgid ""
    … …  
    1059410643"{2}."
    1059510644
    10596 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
     10645#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283
    1059710646msgid "Incomplete <member> specification with ref=0"
    1059810647msgstr "Неполная спецификация <member> с ref=0"
    1059910648
    10600 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
     10649#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295
    1060110650#, java-format
    1060210651msgid "Undefined element ''{0}'' found in input stream. Skipping."
    … …  
    1060410653"Неопределённый элемент ''{0}'' обнаружен во входящем потоке. Пропущено."
    1060510654
    10606 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
     10655#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323
    1060710656msgid "Illegal object with ID=0."
    1060810657msgstr "Недопустимый объект с id=0"
    1060910658
    10610 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
    10611 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
     10659#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
     10660#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
    1061210661#, java-format
    1061310662msgid ""
    … …  
    1061910668
    1062010669#. default version in 0.5 files for existing primitives
    10621 #. default version in 0.5 files for new primitives
    10622 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
    10623 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
    10624 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
    10625 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
    10626 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379
     10670#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355
     10671#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360
     10672#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
     10673#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377
    1062710674#, java-format
    1062810675msgid ""
    … …  
    1063410681
    1063510682#. should not happen. API version has been checked before
    10636 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
     10683#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
    1063710684#, java-format
    1063810685msgid "Unknown or unsupported API version. Got {0}."
    1063910686msgstr "Неизвестная или неподдерживаемая версия API. Получено {0}."
    1064010687
    10641 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
     10688#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374
    1064210689#, java-format
    1064310690msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
    1064410691msgstr "Отсутствует атрибут ''version'' на элементе OSM с ID {0}."
    1064510692
    10646 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
     10693#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
    1064710694#, java-format
    1064810695msgid "Missing required attribute ''{0}''."
    1064910696msgstr "Отсутствует нужный атрибут ''{0}''."
    1065010697
    10651 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402
     10698#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404
    1065210699#, java-format
    1065310700msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
    1065410701msgstr "Неверная длина значения атрибута ''{0}''. Получено ''{1}''."
    1065510702
    10656 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426
     10703#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
    1065710704#, java-format
    1065810705msgid ""
    … …  
    1114011187msgstr "(Текст уже скопирован в буфер обмена)"
    1114111188
    11142 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
     11189#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
    1114311190#, java-format
    1114411191msgid ""
    … …  
    1114911196"адрес сервера в настройках и соединение с интернет.</html>"
    1115011197
    11151 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
    11152 #, java-format
    11153 msgid ""
    11154 "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
    11155 "changeset will automatically be closed by the server after a timeout.</html>"
    11156 msgstr ""
    11157 "<html>Невозможно закрыть пакет правок ''{0}'' на сервере OSM ''{1}''."
    11158 "<br>Пакет правок будет автоматически закрыт сервером по истечении времени "
    11159 "ожидания.</html>"
    11160 
    11161 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
     11198#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
    1116211199#, java-format
    1116311200msgid ""
    … …  
    1117011207"удалите ссылку на отношение {0}, затем снова загрузите на сервер.</html>"
    1117111208
    11172 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
     11209#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
    1117311210#, java-format
    1117411211msgid ""
    … …  
    1118111218"{0}</html>"
    1118211219
    11183 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
    11184 #, java-format
    11185 msgid "Failed to parse date ''{0}'' replied by server."
    11186 msgstr "Сервер сообщил о неудавшемся разборе даты ''{0}''."
    11187 
    11188 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
     11220#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
    1118911221#, java-format
    1119011222msgid ""
    … …  
    1119511227"он уже был закрыт.</html>"
    1119611228
    11197 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
     11229#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
    1119811230#, java-format
    1119911231msgid ""
    … …  
    1120411236"он уже был закрыт в {1}.</html>"
    1120511237
    11206 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
     11238#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
    1120711239#, java-format
    1120811240msgid ""
    … …  
    1121311245"(англ.):<br>{0}</html>"
    1121411246
    11215 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
     11247#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
    1121611248msgid "<html>The server reported that it has detected a conflict.</html>"
    1121711249msgstr "<html>Сервер сообщил, что обнаружен конфликт.</html>"
    1121811250
    11219 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
     11251#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
     11252#, fuzzy, java-format
     11253msgid ""
     11254"<html>Failed to upload to changeset <strong>{0}</strong><br>because it has "
     11255"already been closed on {1}.</html>"
     11256msgstr ""
     11257"<html>Закрытие пакета правок <strong>{0}</strong> не удалось<br>, потому что "
     11258"он уже был закрыт в {1}.</html>"
     11259
     11260#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
    1122011261#, java-format
    1122111262msgid ""
    … …  
    1122811269"формы приложения ''{1}''.</html>"
    1122911270
    11230 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
     11271#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
    1123111272#, java-format
    1123211273msgid ""
    … …  
    1123711278"<br>Пожалуйста проверьте свое подключение к интернету.</html>"
    1123811279
    11239 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
     11280#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
    1124011281#, java-format
    1124111282msgid ""
    … …  
    1124611287"проблемы передачи данных.<br>Подробнее: {1}</html>"
    1124711288
    11248 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
     11289#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
    1124911290#, java-format
    1125011291msgid ""
    … …  
    1125511296"временная проблема. Пожалуйста, попробуйте позднее.</html>"
    1125611297
    11257 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
     11298#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
    1125811299#, java-format
    1125911300msgid "The OSM server ''{0}'' reported a bad request.<br>"
    1126011301msgstr "Сервер OSM ''{0}'' сообщил о неудачном запросе.<br>"
    1126111302
    11262 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
     11303#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
    1126311304msgid ""
    1126411305"The area you tried to download is too big or your request was too large."
    … …  
    1127011311"средствами экспорта файлов OSM."
    1127111312
    11272 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
     11313#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
    1127311314#, java-format
    1127411315msgid "<br>Error message(untranslated): {0}"
    1127511316msgstr "<br>Сообщение об ошибке (на английском): {0}"
    1127611317
    11277 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
     11318#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
    1127811319#, java-format
    1127911320msgid ""
    … …  
    1128811329"Пожалуйста, внимательно проверьте адрес сервера ''{0}'' на предмет опечаток."
    1128911330
    11290 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
     11331#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
    1129111332#, java-format
    1129211333msgid ""
    … …  
    1129911340"программы и ваше соединение с интернет.</html>"
    1130011341
    11301 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
     11342#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
    1130211343#, java-format
    1130311344msgid ""
    … …  
    1206112102msgstr "Ошибка в файле {0}"
    1206212103
    12063 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
     12104#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97
    1206412105#, java-format
    1206512106msgid ""
    … …  
    1207512116#. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
    1207612117#. this below is a temporary workaround to fix the "always on top" issue
    12077 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97
     12118#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
    1207812119#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387
    1207912120msgid "Select Feuille"
    1208012121msgstr "Выбрать Feuille (слой??)"
    1208112122
    12082 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
    12083 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
     12123#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142
     12124#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432
    1208412125msgid "Error loading file"
    1208512126msgstr "Ошибка при загрузке файла"
    1208612127
    12087 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17
    12088 msgid "Lambert Zone 1 cache file (.1)"
     12128#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17
     12129#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18
     12130#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19
     12131#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20
     12132#, fuzzy, java-format
     12133msgid "Lambert Zone {0} cache file (.{0})"
    1208912134msgstr "Lambert зона 1 кэш файл (.1)"
    1209012135
    12091 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18
    12092 msgid "Lambert Zone 2 cache file (.2)"
     12136#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19
     12137#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20
     12138#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21
     12139#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22
     12140#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23
     12141#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24
     12142#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25
     12143#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26
     12144#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27
     12145#, fuzzy, java-format
     12146msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
     12147msgstr "Lambert зона 1 кэш файл (.1)"
     12148
     12149#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19
     12150#, fuzzy
     12151msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
     12152msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
     12153
     12154#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20
     12155#, fuzzy
     12156msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
    1209312157msgstr "Lambert зона 21 кэш файл (.2)"
    1209412158
    12095 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19
    12096 msgid "Lambert Zone 3 cache file (.3)"
     12159#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21
     12160#, fuzzy
     12161msgid "Martinique Fort Desaix cache file (.UTM3)"
    1209712162msgstr "Lambert зона 3 кэш файл (.3)"
    12098 
    12099 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20
    12100 msgid "Lambert Zone 4 cache file (.4)"
    12101 msgstr "Lambert зона 4 кэш файл (.4)"
    1210212163
    1210312164#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42
    … …  
    1212812189msgstr "Выбрать из..."
    1212912190
    12130 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
     12191#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
    1213112192msgid "Cadastre"
    1213212193msgstr "Кадастр"
    1213312194
    12134 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
     12195#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151
    1213512196msgid "Auto sourcing"
    1213612197msgstr "Авто источники"
    1213712198
    12138 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
     12199#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206
    1213912200msgid ""
    1214012201"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
    … …  
    1214612207"Вы хотите назначить на клавишу F11 функцию захвата?"
    1214712208
    12148 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
     12209#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209
    1214912210msgid "Restore grab shortcut F11"
    1215012211msgstr "Восстановить действие захватывающей клавиши F11"
    1215112212
    12152 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
     12213#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214
    1215312214msgid "JOSM is stopped for the change to take effect."
    1215412215msgstr "JOSM остановлено для того, чтобы проявились изменения."
    1215512216
    12156 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
     12217#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276
    1215712218#, java-format
    1215812219msgid ""
    … …  
    1246012521msgstr "Установить {0} Lambert координаты"
    1246112522
    12462 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33
    12463 msgid "Set manually the Lambert zone"
    12464 msgstr "Задать вручную Lambert zone"
    12465 
    12466 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44
    12467 msgid "Zone"
    12468 msgstr "Зона"
    12469 
    12470 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
    12471 msgid "Lambert zone"
    12472 msgstr "Зона Ламберта"
    12473 
    12474 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23
     12523#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24
    1247512524msgid "Load location from cache (only if cache is enabled)"
    1247612525msgstr "Загрузка расположения из кэша (только если кэш включен)"
    1247712526
    12478 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40
     12527#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
    1247912528#, java-format
    1248012529msgid "{0} not allowed with the current projection"
    1248112530msgstr "{0} не позволено в текущей проекции"
    1248212531
    12483 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
     12532#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57
     12533#, fuzzy, java-format
     12534msgid ""
     12535"Cannot load cache {0} which is not compatible with current projection zone"
     12536msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}"
     12537
     12538#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63
     12539#, java-format
     12540msgid ""
     12541"Selected file {0} is not a cache file from this plugin (invalid extension)"
     12542msgstr ""
     12543
     12544#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
     12545#, java-format
     12546msgid "The location {0} is already on screen. Cache not loaded."
     12547msgstr ""
     12548
     12549#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28
    1248412550msgid "Change location"
    1248512551msgstr "Изменить расположение"
    1248612552
    12487 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
     12553#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28
    1248812554msgid "Set a new location for the next request"
    1248912555msgstr "Установить новое место для следующего запроса"
    1249012556
    12491 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
     12557#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
    1249212558msgid "Add a new layer"
    1249312559msgstr "Добавить новый слой"
    1249412560
    12495 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
     12561#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
    1249612562#: build/trans_presets.java:2349
    1249712563msgid "Location"
    1249812564msgstr "Расположение"
    1249912565
    12500 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
     12566#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51
    1250112567msgid ""
    1250212568"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
    … …  
    1250612572"пунктуацию опубликованную www.cadastre.gouv.fr </html>"
    1250712573
    12508 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
     12574#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
    1250912575msgid "Add new layer"
    1251012576msgstr "Добавить новый слой"
    … …  
    1253612602
    1253712603#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
    12538 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41
     12604#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
    1253912605msgid "Adjust WMS"
    1254012606msgstr "Подстроить WMS"
    … …  
    1256612632"Выберите сначала один из них, а затем повторите"
    1256712633
    12568 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79
     12634#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
    1256912635#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75
    1257012636#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
    … …  
    1257212638msgstr "Пустой слой"
    1257312639
    12574 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185
     12640#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
    1257512641#, java-format
    1257612642msgid "WMS layer ({0}), {1} tile(s) loaded"
    1257712643msgstr "слой WMS ({0}), квадратов загружено: {1}"
    1257812644
    12579 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
     12645#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
    1258012646msgid "Is not vectorized."
    1258112647msgstr "Не векторизованны."
    1258212648
    12583 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188
     12649#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
    1258412650#, java-format
    1258512651msgid "Raster size: {0}"
    1258612652msgstr "Размер растра: {0}"
    1258712653
    12588 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190
     12654#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189
    1258912655msgid "Is vectorized."
    1259012656msgstr "Векторизован."
    1259112657
    12592 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
     12658#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190
    1259312659#, java-format
    1259412660msgid "Commune bbox: {0}"
    1259512661msgstr "общий квадрат: {0}"
    1259612662
    12597 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
     12663#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
    1259812664#, java-format
    1259912665msgid ""
    … …  
    1260412670"Создайте новый файл."
    1260512671
    12606 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
     12672#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
    1260712673msgid "Cache Format Error"
    1260812674msgstr "Ошибка формата кеша"
    1260912675
    12610 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416
     12676#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
    1261112677#, java-format
    1261212678msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
    1261312679msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}"
    1261412680
    12615 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418
     12681#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
    1261612682msgid "Cache Lambert Zone Error"
    1261712683msgstr "Ошибка кеширования зоны Ламберта"
    12618 
    12619 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
    12620 #, java-format
    12621 msgid ""
    12622 "Current layer is in Lambert CC9 Zone \"{0}\"\n"
    12623 "where the commune is in Lambert CC9 Zone \"{1}\".\n"
    12624 "Upload your changes, close all layers and change\n"
    12625 "manually the Lambert zone from the Cadastre menu"
    12626 msgstr ""
    12627 "Текущий слой в Lambert CC9 Zone это \"{0}\"\n"
    12628 "где коммуна в Lambert CC9 Zone это \"{1}\".\n"
    12629 "Загрузите на сервер изменения, закройте все слои\n"
    12630 "и измените вручную Lambert zone в меню Кадастр"
    1263112684
    1263212685#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
    … …  
    1369113744
    1369213745#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
    13693 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
    13694 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
     13746#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233
     13747#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246
    1369513748msgid "Do you want to allow this?"
    1369613749msgstr "Разрешить действие?"
    1369713750
    1369813751#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
    13699 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
    13700 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
     13752#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234
     13753#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247
    1370113754msgid "Confirm Remote Control action"
    1370213755msgstr "Подтверждение действия дистанционного управления"
    1370313756
    13704 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
     13757#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232
    1370513758msgid "Remote Control has been asked to create a new node."
    1370613759msgstr "Пультом управления было предложено создать новую точку."
    1370713760
    13708 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
     13761#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244
    1370913762msgid "Remote Control has been asked to import data from the following URL:"
    1371013763msgstr ""
    … …  
    1382813881msgstr "Отдалить"
    1382913882
    13830 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214
    13831 msgid "Snap to tile size"
    13832 msgstr "Привязаться к размеру квадрата"
    13833 
    13834 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226
     13883#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232
    1383513884msgid "Flush Tile Cache"
    1383613885msgstr "Очистить кеш квадрата карты"
    1383713886
    13838 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663
     13887#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668
    1383913888msgid "image "
    1384013889msgstr "изображение "
    … …  
    1442614475
    1442714476#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
    14428 msgid "Unconnceted coastline"
     14477#, fuzzy
     14478msgid "Unconnected coastline"
    1442914479msgstr "Неприсоединённая береговая линия"
    1443014480
    … …  
    1509115141#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55
    1509215142#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58
    15093 #, fuzzy
    1509415143msgid "Way Download"
    15095 msgstr "Скачать"
     15144msgstr "Скачать линию"
    1509615145
    1509715146#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
    15098 #, fuzzy
    1509915147msgid "Download map data on the end of selected way"
    15100 msgstr "Скачать картографические данные с сервера OSM."
     15148msgstr "Скачать данные карты, лежащие на конце выбранной линии"
    1510115149
    1510215150#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99
    … …  
    1511015158msgid "<html>Could not find a unique node to start downloading from.</html>"
    1511115159msgstr ""
     15160"<html>Не удалось найти уникальную точку, чтобы начать с неё загрузку.</html>"
    1511215161
    1511315162#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118
    15114 #, fuzzy, java-format
     15163#, java-format
    1511515164msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
    15116 msgstr ""
    15117 "<html>Нет слоёв, с которым исходный слой<br>''{0}''<br>может быть объединён."
    15118 "</html>"
     15165msgstr "<html>Нет линий, присоединённых к точке ''{0}''. Отменено.</html>"
    1511915166
    1512015167#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168
    … …  
    1512415171"discovered after download"
    1512515172msgstr ""
     15173"Данные модуля скачивания линии неполные. Ранее присоединённая линия ''{0}'' "
     15174"не была обнаружена после скачивания с сервера"
    1512615175
    1512715176#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:182
    … …  
    1513615185
    1513715186#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195
    15138 #, fuzzy
    1513915187msgid "Merge duplicate node?"
    15140 msgstr "Удаление повторяющихся точек..."
     15188msgstr "Объединить дубликаты точек?"
    1514115189
    1514215190#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212
    15143 #, fuzzy
    1514415191msgid "<html>No more connected ways to download.</html>"
    15145 msgstr ""
    15146 "<html>В настоящий момент не выбрана область для скачивания с сервера.</html>"
     15192msgstr "<html>Нет больше присоединённых линий для скачивания с сервера.</html>"
    1514715193
    1514815194#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:221
    1514915195#, java-format
    1515015196msgid "Node ''{0}'' is a junction with more than 2 connected ways."
    15151 msgstr ""
     15197msgstr "Точка ''{0}'' это соединение более, чем 2 пересекающихся линий."
    1515215198
    1515315199#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
    … …  
    1520815254msgstr "Нет верных WMS URL или ID"
    1520915255
    15210 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
     15256#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
    1521115257msgid "Adjust the position of the selected WMS layer"
    1521215258msgstr "Отрегулируйте положение выбранного слоя WMS"
    1521315259
    15214 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
     15260#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
    1521515261msgid "Please select the WMS layer to adjust."
    1521615262msgstr "Пожалуйста, выберите слой WMS для выравнивания"
    1521715263
    15218 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
     15264#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
    1521915265msgid "Select WMS layer"
    1522015266msgstr "Выбрать слой WMS"
    1522115267
    15222 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
     15268#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179
    1522315269msgid "Start adjusting"
    1522415270msgstr "Начало выравнивания"
    1522515271
    15226 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
     15272#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
    1522715273msgid "There are currently no WMS layer to adjust."
    1522815274msgstr "Нет слоя WMS для выравнивания."
    1522915275
    15230 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
     15276#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199
    1523115277msgid "No layers to adjust"
    1523215278msgstr "Нет слоёв для выравнивания"
    1523315279
    15234 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111
     15280#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115
    1523515281#, java-format
    1523615282msgid ""
    … …  
    1524115287"знак '&' или '?'."
    1524215288
    15243 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
     15289#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116
    1524415290msgid ""
    1524515291"Warning: Fetching WMS tiles is likely to fail. Please check you preference "
    … …  
    1524915295"Пожалуйста, проверьте настройки параметров."
    1525015296
    15251 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
     15297#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
    1525215298#, java-format
    1525315299msgid "Warning: The complete URL is ''{0}''."
    1525415300msgstr "Предупреждение: Полная ссылка: ''{0}''."
    1525515301
    15256 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134
     15302#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138
    1525715303#, java-format
    1525815304msgid ""
    … …  
    1526715313msgstr "Автоматическое скачивание"
    1526815314
    15269 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
     15315#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104
    1527015316#, java-format
    1527115317msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
    … …  
    1527415320"искажена"
    1527515321
    15276 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98
     15322#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
    1527715323msgid "(deactivated)"
    1527815324msgstr "(деактивировано)"
    1527915325
    15280 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145
     15326#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153
    1528115327#, java-format
    1528215328msgid "WMS layer ({0}), automatically downloading in zoom {1}"
    1528315329msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}"
    1528415330
    15285 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147
     15331#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155
    1528615332#, java-format
    1528715333msgid "WMS layer ({0}), downloading in zoom {1}"
    1528815334msgstr "Скачивание слоя WMS ({0}), в масштабе {1}"
    1528915335
    15290 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
     15336#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198
    1529115337#, java-format
    1529215338msgid ""
    … …  
    1530115347"попытаться извлечь квадраты WMS?"
    1530215348
    15303 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198
     15349#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
    1530415350msgid "Yes, fetch images"
    1530515351msgstr "Да, выбрать изображения"
    1530615352
    15307 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204
     15353#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
    1530815354msgid "Invalid URL?"
    1530915355msgstr "Ошибочная ссылка?"
    1531015356
    15311 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
     15357#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
    1531215358msgid ""
    1531315359"The requested area is too big. Please zoom in a little, or change resolution"
    … …  
    1531615362"измените разрешение"
    1531715363
    15318 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
     15364#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
    1531915365msgid "Download visible tiles"
    1532015366msgstr "Скачать видимые квадраты карты"
    1532115367
    15322 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
     15368#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
    1532315369msgid "Change resolution"
    1532415370msgstr "Изменить разрешение"
    1532515371
    15326 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
     15372#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
    1532715373msgid "Reload erroneous tiles"
    1532815374msgstr "Перезагрузить ошибочные квадраты карты"
    1532915375
    15330 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339
     15376#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348
    1533115377msgid "Alpha channel"
    1533215378msgstr "Альфа канал"
    1533315379
    15334 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359
     15380#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
    1533515381msgid "Save WMS layer to file"
    1533615382msgstr "Сохранить слой WMS в файл"
    1533715383
    15338 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363
     15384#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372
    1533915385msgid "Save WMS layer"
    1534015386msgstr "Сохраниеть WMS слой"
    1534115387
    15342 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387
     15388#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
    1534315389msgid "Load WMS layer from file"
    1534415390msgstr "Загрузить слой WMS из файла"
    1534515391
    15346 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391
     15392#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
    1534715393msgid "Load WMS layer"
    1534815394msgstr "Загрузить WMS слой"
    1534915395
    15350 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
     15396#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411
    1535115397#, java-format
    1535215398msgid "Unsupported WMS file version; found {0}, expected {1}"
    … …  
    1535415400"Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}"
    1535515401
    15356 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
     15402#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
    1535715403msgid "File Format Error"
    1535815404msgstr "Ошибка формата файла"
     15405
     15406#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
     15407#, fuzzy
     15408msgid "Set WMS Bookmark"
     15409msgstr "Создать закладку"
    1535915410
    1536015411#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
    … …  
    2771927770#. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
    2772027771#. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
    27721 #. *    : W : natural == water && waterway == *
     27772#. *    : W : natural == water && waterway == *                   # unusual tag combination
    2772227773#. *    : W : highway == * && waterway == *
    27723 #: build/trans_validator.java:77 build/trans_validator.java:78
    27724 #: build/trans_validator.java:79
     27774#: build/trans_validator.java:78 build/trans_validator.java:79
    2772527775msgid "unusual tag combination"
    2772627776msgstr "необычная комбинация тегов"
    … …  
    2774027790
    2774127791#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
    27742 #. fails with division by zero error
    27743 #: build/trans_wms.java:8
    27744 msgid "NPE Maps"
    27745 msgstr "карты NPE"
    27746 
    27747 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
    27748 #: build/trans_wms.java:9
    27749 msgid "NPE Maps (Tim)"
    27750 msgstr "NPE Карты (Tim)"
    27751 
    27752 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
    2775327792#.
    2775427793#. different forms for web access
    2775527794#. must be html:<url>
    27756 #: build/trans_wms.java:13
     27795#: build/trans_wms.java:10
    2775727796msgid "Yahoo Sat"
    2775827797msgstr "Yahoo Sat"
    2775927798
    2776027799#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
    27761 #: build/trans_wms.java:14
     27800#: build/trans_wms.java:11
    2776227801msgid "OpenStreetMap"
    2776327802msgstr "OpenStreetMap"
    2776427803
    2776527804#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
    27766 #: build/trans_wms.java:15
     27805#: build/trans_wms.java:12
    2776727806msgid "OpenCycleMap"
    2776827807msgstr "OpenCycleMap"
    2776927808
    2777027809#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
    27771 #: build/trans_wms.java:16
     27810#: build/trans_wms.java:13
    2777227811msgid "TilesAtHome"
    2777327812msgstr "TilesAtHome"
    … …  
    2777727816#.
    2777827817#. only for Germany
    27779 #: build/trans_wms.java:20
     27818#: build/trans_wms.java:17
    2778027819msgid "Streets NRW Geofabrik.de"
    2778127820msgstr "Улицы NRW Geofabrik.de"
    2778227821
    2778327822#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
     27823#.
     27824#.
     27825#. only for North America
    2778427826#. Terraserver USCG - High resolution maps
    2778527827#: build/trans_wms.java:22
    … …  
    2779327835
    2779427836#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
     27837#.
     27838#.
    2779527839#. only for Czech Republic
    27796 #: build/trans_wms.java:25
     27840#: build/trans_wms.java:27
    2779727841msgid "Czech CUZK:KM"
    2779827842msgstr "Czech CUZK:KM"
    2779927843
    2780027844#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE&
    27801 #: build/trans_wms.java:26
     27845#: build/trans_wms.java:28
    2780227846msgid "Czech UHUL:ORTOFOTO"
    2780327847msgstr "Czech UHUL:ORTOFOTO"
    2780427848
    27805 #~ msgid "Can't search because there is no loaded data."
    27806 #~ msgstr "Поиск невозможен, так как не загружено никаких данных."
    27807 
    27808 #~ msgid "There's no primitive with version {0} in this history."
    27809 #~ msgstr "В этой истории не существует элемента версии {0}"
    27810 
    27811 #~ msgid "There's no version valid at date ''{0}'' in this history."
    27812 #~ msgstr "Нет версии действительной для даты \"{0}\" в этой истории"
    27813 
    27814 #~ msgid "No earliest version found. History is empty."
    27815 #~ msgstr "более ранняя версия не найдена. История пуста."
    27816 
    27817 #~ msgid "No latest version found. History is empty."
    27818 #~ msgstr "более поздняя версия не найдена. История пуста."
    27819 
    27820 #~ msgid "No type found. History is empty."
    27821 #~ msgstr "Тип не найден. История пуста."
    27822 
    27823 #~ msgid "Didn't find an primitive with id {0} in this dataset"
    27824 #~ msgstr "Элемент с id {0} не был найден в этом наборе данных"
    27825 
    27826 #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
    27827 #~ msgstr "Элемент с id {0} и версией {1} не был найден в этом наборе данных"
    27828 
    27829 #~ msgid "Select a starting node on the end of a way"
    27830 #~ msgstr "Выделите начальную точку на конце линии"
    27831 
    27832 #~ msgid "Reached the end of the line"
    27833 #~ msgstr "Достигнут конец линии"
    27834 
    27835 #~ msgid "Reached a junction"
    27836 #~ msgstr "Достигнут перекрёсток"
    27837 
    27838 #~ msgid "help"
    27839 #~ msgstr "Справка"
    27840 
    27841 #~ msgid "Help / About"
    27842 #~ msgstr "Справка / О модуле"
     27849#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
     27850#.
     27851#.
     27852#. only for GB
     27853#. fails with division by zero error
     27854#: build/trans_wms.java:33
     27855msgid "NPE Maps"
     27856msgstr "карты NPE"
     27857
     27858#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
     27859#: build/trans_wms.java:34
     27860msgid "NPE Maps (Tim)"
     27861msgstr "NPE Карты (Tim)"
     27862
     27863#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
     27864#: build/trans_wms.java:35
     27865msgid "7th Series (OS7)"
     27866msgstr ""
     27867
     27868#. http://ooc.openstreetmap.org/wms/map.php?source=os7&
     27869#.
     27870#.
     27871#. only for Japan
     27872#: build/trans_wms.java:39
     27873msgid "MLIT Japan (ORTHO)"
     27874msgstr ""
     27875
     27876#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
     27877#: build/trans_wms.java:40
     27878msgid "MLIT Japan (ORTHO01)"
     27879msgstr ""
     27880
     27881#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
     27882#: build/trans_wms.java:41
     27883msgid "MLIT Japan (ORTHO02)"
     27884msgstr ""
     27885
     27886#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
     27887#: build/trans_wms.java:42
     27888msgid "MLIT Japan (ORTHO03)"
     27889msgstr ""
     27890
     27891#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
     27892#.
     27893#.
     27894#. only for Italy
     27895#: build/trans_wms.java:46
     27896msgid "Lodi - Italy"
     27897msgstr ""
     27898
     27899#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
     27900#: build/trans_wms.java:47
     27901msgid "Sicily - Italy"
     27902msgstr ""
     27903
     27904#~ msgid "Lambert Zone 2 cache file (.2)"
     27905#~ msgstr "Lambert зона 21 кэш файл (.2)"
     27906
     27907#~ msgid "Lambert Zone 3 cache file (.3)"
     27908#~ msgstr "Lambert зона 3 кэш файл (.3)"
     27909
     27910#~ msgid "Lambert Zone 4 cache file (.4)"
     27911#~ msgstr "Lambert зона 4 кэш файл (.4)"
     27912
     27913#, fuzzy
     27914#~ msgid "Lambert CC9 Zone 2 cache file (.CC2)"
     27915#~ msgstr "Lambert зона 21 кэш файл (.2)"
     27916
     27917#, fuzzy
     27918#~ msgid "Lambert CC9 Zone 3 cache file (.CC3)"
     27919#~ msgstr "Lambert зона 3 кэш файл (.3)"
     27920
     27921#, fuzzy
     27922#~ msgid "Lambert CC9 Zone 4 cache file (.CC4)"
     27923#~ msgstr "Lambert зона 4 кэш файл (.4)"
     27924
     27925#, fuzzy
     27926#~ msgid "Lambert CC9 Zone 5 cache file (.CC5)"
     27927#~ msgstr "Lambert зона 1 кэш файл (.1)"
     27928
     27929#, fuzzy
     27930#~ msgid "Lambert CC9 Zone 6 cache file (.CC6)"
     27931#~ msgstr "Lambert зона 1 кэш файл (.1)"
     27932
     27933#, fuzzy
     27934#~ msgid "Lambert CC9 Zone 7 cache file (.CC7)"
     27935#~ msgstr "Lambert зона 1 кэш файл (.1)"
     27936
     27937#, fuzzy
     27938#~ msgid "Lambert CC9 Zone 8 cache file (.CC8)"
     27939#~ msgstr "Lambert зона 1 кэш файл (.1)"
     27940
     27941#, fuzzy
     27942#~ msgid "Lambert CC9 Zone 9 cache file (.CC9)"
     27943#~ msgstr "Lambert зона 1 кэш файл (.1)"
     27944
     27945#~ msgid "null detected in node list"
     27946#~ msgstr "обнаружено значение null в списке точек"
     27947
     27948#~ msgid "unexpected null value for n.getEastNorth(). id of n is"
     27949#~ msgstr "неожиданное значение null для n.getEastNorth(). id из n"
    2784327950
    2784427951#~ msgid ""
    27845 #~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
    27846 #~ "- these will then show up in the WMS menu.\n"
    27847 #~ "\n"
    27848 #~ "You can also do this manually in the Advanced Preferences, using the "
    27849 #~ "following schema:\n"
    27850 #~ "wmsplugin.url.1.name=Landsat\n"
    27851 #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
    27852 #~ "wmsplugin.url.2.name=NPE Maps... etc\n"
    27853 #~ "\n"
    27854 #~ "Full WMS URL input format example (landsat)\n"
    27855 #~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
    27856 #~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
    27857 #~ "\n"
    27858 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
    27859 #~ "only need to input the relevant 'id'.\n"
    27860 #~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
    27861 #~ "in this example, replacing 73 with your image id:\n"
    27862 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
    27863 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
    27864 #~ "\n"
    27865 #~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
    27866 #~ "use."
     27952#~ "IMPORTANT : data positioned far away from\n"
     27953#~ "the current Lambert zone limits.\n"
     27954#~ "Do not upload any data after this message.\n"
     27955#~ "Undo your last action, save your work\n"
     27956#~ "and start a new layer on the new zone."
    2786727957#~ msgstr ""
    27868 #~ "Можно добавлять, редактировать и удалять сервисы WMS на вкладке "
    27869 #~ "\"Параметры модуля WMS\" - они будут отображены в меню WMS.\n"
    27870 #~ "\n"
    27871 #~ "Также можно сделать это вручную в \"Расширенных настройках\", используя "
    27872 #~ "следующую схему:\n"
    27873 #~ "wmsplugin.url.1.name=Landsat\n"
    27874 #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
    27875 #~ "wmsplugin.url.2.name=NPE Maps... и так далее\n"
    27876 #~ "\n"
    27877 #~ "Пример входного формата: полный URL WMS (landsat)\n"
    27878 #~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
    27879 #~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
    27880 #~ "\n"
    27881 #~ "Для Metacarta's Map Rectifier (http://labs.metacarta.com/rectifier/) , "
    27882 #~ "всё что нужно - ввести соответствующий 'id'.\n"
    27883 #~ "Чтобы добавить пункт меню \"Metacarta Map Rectifier\", создайте URL как в "
    27884 #~ "приведённом примере, заменив 73 на id вашего изображения:\n"
    27885 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
    27886 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
    27887 #~ "\n"
    27888 #~ "Примечание: Убедитесь что использование изображения легально, если в этом "
    27889 #~ "есть хоть какие-то сомнения - не используйте его."
    27890 
    27891 #~ msgid "WMS Plugin Help"
    27892 #~ msgstr "Справка по модулю WMS"
     27958#~ "ВАЖНО : данные расположены слишком\n"
     27959#~ "далеко от текущих границ Lambert зоны.\n"
     27960#~ "Не загружайте пока никаких данных .\n"
     27961#~ "Отмените последнее действие, сохраните\n"
     27962#~ "данные и начните новый слой в новой зоне."
     27963
     27964#~ msgid "Edit Properties"
     27965#~ msgstr "Изменить параметры"
     27966
     27967#~ msgid "Linked"
     27968#~ msgstr "Связанные"
     27969
     27970#~ msgid ""
     27971#~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
     27972#~ "changeset will automatically be closed by the server after a timeout.</"
     27973#~ "html>"
     27974#~ msgstr ""
     27975#~ "<html>Невозможно закрыть пакет правок ''{0}'' на сервере OSM ''{1}''."
     27976#~ "<br>Пакет правок будет автоматически закрыт сервером по истечении времени "
     27977#~ "ожидания.</html>"
     27978
     27979#~ msgid "Set manually the Lambert zone"
     27980#~ msgstr "Задать вручную Lambert zone"
     27981
     27982#~ msgid "Zone"
     27983#~ msgstr "Зона"
     27984
     27985#~ msgid ""
     27986#~ "Current layer is in Lambert CC9 Zone \"{0}\"\n"
     27987#~ "where the commune is in Lambert CC9 Zone \"{1}\".\n"
     27988#~ "Upload your changes, close all layers and change\n"
     27989#~ "manually the Lambert zone from the Cadastre menu"
     27990#~ msgstr ""
     27991#~ "Текущий слой в Lambert CC9 Zone это \"{0}\"\n"
     27992#~ "где коммуна в Lambert CC9 Zone это \"{1}\".\n"
     27993#~ "Загрузите на сервер изменения, закройте все слои\n"
     27994#~ "и измените вручную Lambert zone в меню Кадастр"
     27995
     27996#~ msgid "Snap to tile size"
     27997#~ msgstr "Привязаться к размеру квадрата"
    2789327998
    2789427999#~ msgid "No data imported."
    … …  
    2810828213#~ msgid "Adjust the position of the WMS layer"
    2810928214#~ msgstr "Подстроить положение слоя WMS"
     28215
     28216#~ msgid "WMS Plugin Help"
     28217#~ msgstr "Справка по модулю WMS"
     28218
     28219#~ msgid "Help / About"
     28220#~ msgstr "Справка / О модуле"
    2811028221
    2811128222#~ msgid "Navigation"
    … …  
    2864528756#~ msgstr "Сбой инициализации API. Пожалуйста, попробуйте снова позднее."
    2864628757
     28758#~ msgid "Reached the end of the line"
     28759#~ msgstr "Достигнут конец линии"
     28760
     28761#~ msgid "Reached a junction"
     28762#~ msgstr "Достигнут перекрёсток"
     28763
    2864728764#~ msgid "removing reference from way {0}"
    2864828765#~ msgstr "удаление ссылки из линии {0}"
    … …  
    2875128868#~ "его после загрузки"
    2875228869
     28870#~ msgid "Can't search because there is no loaded data."
     28871#~ msgstr "Поиск невозможен, так как не загружено никаких данных."
     28872
    2875328873#~ msgid "Use the existing changeset {0} and close it after upload"
    2875428874#~ msgstr ""
    … …  
    2880928929#~ msgid "Purging 1 primitive"
    2881028930#~ msgstr "Очистка 1 элемента"
     28931
     28932#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
     28933#~ msgstr "Элемент с id {0} и версией {1} не был найден в этом наборе данных"
     28934
     28935#~ msgid "Didn't find an primitive with id {0} in this dataset"
     28936#~ msgstr "Элемент с id {0} не был найден в этом наборе данных"
    2881128937
    2881228938#~ msgid "Primitive already deleted"
    … …  
    2883428960#~ "ошибке:<br>{0}</html>"
    2883528961
     28962#~ msgid "Select a starting node on the end of a way"
     28963#~ msgstr "Выделите начальную точку на конце линии"
     28964
    2883628965#~ msgid "Only two nodes allowed"
    2883728966#~ msgstr "Можно только две точки"
    … …  
    2884728976#~ msgid "Unexpected return value. Got {0}."
    2884828977#~ msgstr "неожиданное возвращённое значение. Получено {0}"
     28978
     28979#~ msgid "There's no version valid at date ''{0}'' in this history."
     28980#~ msgstr "Нет версии действительной для даты \"{0}\" в этой истории"
     28981
     28982#~ msgid "No earliest version found. History is empty."
     28983#~ msgstr "более ранняя версия не найдена. История пуста."
     28984
     28985#~ msgid "No latest version found. History is empty."
     28986#~ msgstr "более поздняя версия не найдена. История пуста."
    2884928987
    2885028988#~ msgid "Index out of bounds. Got {0}."
    … …  
    2886729005#~ msgstr "Показать историю выделенного элемента"
    2886829006
     29007#~ msgid "There's no primitive with version {0} in this history."
     29008#~ msgstr "В этой истории не существует элемента версии {0}"
     29009
    2886929010#~ msgid "MIddle way: {0}"
    2887029011#~ msgstr "Середина линии: {0}"
     29012
     29013#~ msgid ""
     29014#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
     29015#~ "- these will then show up in the WMS menu.\n"
     29016#~ "\n"
     29017#~ "You can also do this manually in the Advanced Preferences, using the "
     29018#~ "following schema:\n"
     29019#~ "wmsplugin.url.1.name=Landsat\n"
     29020#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
     29021#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
     29022#~ "\n"
     29023#~ "Full WMS URL input format example (landsat)\n"
     29024#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
     29025#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
     29026#~ "\n"
     29027#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
     29028#~ "only need to input the relevant 'id'.\n"
     29029#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
     29030#~ "in this example, replacing 73 with your image id:\n"
     29031#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
     29032#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
     29033#~ "\n"
     29034#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
     29035#~ "use."
     29036#~ msgstr ""
     29037#~ "Можно добавлять, редактировать и удалять сервисы WMS на вкладке "
     29038#~ "\"Параметры модуля WMS\" - они будут отображены в меню WMS.\n"
     29039#~ "\n"
     29040#~ "Также можно сделать это вручную в \"Расширенных настройках\", используя "
     29041#~ "следующую схему:\n"
     29042#~ "wmsplugin.url.1.name=Landsat\n"
     29043#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
     29044#~ "wmsplugin.url.2.name=NPE Maps... и так далее\n"
     29045#~ "\n"
     29046#~ "Пример входного формата: полный URL WMS (landsat)\n"
     29047#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
     29048#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
     29049#~ "\n"
     29050#~ "Для Metacarta's Map Rectifier (http://labs.metacarta.com/rectifier/) , "
     29051#~ "всё что нужно - ввести соответствующий 'id'.\n"
     29052#~ "Чтобы добавить пункт меню \"Metacarta Map Rectifier\", создайте URL как в "
     29053#~ "приведённом примере, заменив 73 на id вашего изображения:\n"
     29054#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
     29055#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
     29056#~ "\n"
     29057#~ "Примечание: Убедитесь что использование изображения легально, если в этом "
     29058#~ "есть хоть какие-то сомнения - не используйте его."
    2887129059
    2887229060#~ msgid "Show Tile Status"
    … …  
    2893829126#~ msgstr "Обновить выделенные элементы с сервера"
    2893929127
     29128#~ msgid "help"
     29129#~ msgstr "Справка"
     29130
     29131#~ msgid "No type found. History is empty."
     29132#~ msgstr "Тип не найден. История пуста."
     29133
    2894029134#~ msgid "longitude"
    2894129135#~ msgstr "долгота"
Note: See TracChangeset for help on using the changeset viewer.