Ignore:
Timestamp:
2009-06-27T15:59:16+02:00 (17 years ago)
Author:
stoecker
Message:

updated

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r16009 r16179  
    88"Project-Id-Version: josm\n"
    99"Report-Msgid-Bugs-To: \n"
    10 "POT-Creation-Date: 2009-06-19 21:52+0200\n"
    11 "PO-Revision-Date: 2009-06-16 06:44+0000\n"
    12 "Last-Translator: Egor Bushmelyov <Unknown>\n"
     10"POT-Creation-Date: 2009-06-27 14:26+0200\n"
     11"PO-Revision-Date: 2009-06-26 22:47+0000\n"
     12"Last-Translator: mulya <rinat.mulyukov@gmail.com>\n"
    1313"Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
    1414"MIME-Version: 1.0\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-06-19 19:35+0000\n"
     19"X-Launchpad-Export-Date: 2009-06-27 12:18+0000\n"
    2020"X-Generator: Launchpad (build Unknown)\n"
    2121"X-Poedit-Country: RUSSIAN FEDERATION\n"
    … …  
    3030#: ../core/src/org/openstreetmap/josm/Main.java:198
    3131#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
    32 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154
    33 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302
     32#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
     33#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
    3434msgid "Help"
    3535msgstr "Справка"
    … …  
    7575#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
    7676#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
    77 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:341
    78 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
    79 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
    80 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356
     77#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
     78#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
     79#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
    8180#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
    8281#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
    … …  
    8483#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
    8584#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
    86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161
    87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151
     85#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152
    8886#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
    8987#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
    … …  
    103101#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
    104102#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
    105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
    106 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
    107 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105
     103#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
     104#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
     105#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
    108106#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
    109107msgid "Cancel"
    … …  
    208206msgid "File could not be found."
    209207msgstr "Файл не найден"
     208
     209#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38
     210#, java-format
     211msgid ""
     212"WARNING: unexpected format of API base URL. Redirection to history page for "
     213"OSM primitive will probably fail. API base URL is: ''{0}''"
     214msgstr ""
     215
     216#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
     217#, fuzzy
     218msgid "Please select at least one already uploaded node, way, or relation."
     219msgstr "Пожалуйста, выберите хотябы один узел или путь."
     220
     221#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
     222#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
     223#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
     224#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
     225msgid "Warning"
     226msgstr "Предупреждение"
     227
     228#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69
     229#, java-format
     230msgid ""
     231"WARNING: launching browser windows for the first {0} of {1} selected "
     232"primitives only"
     233msgstr ""
    210234
    211235#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
    … …  
    251275#: ../plugins/grid/src/grid/GridLayer.java:193
    252276#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
    253 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
     277#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
    254278msgid "Latitude"
    255279msgstr "Широта"
    … …  
    258282#: ../plugins/grid/src/grid/GridLayer.java:195
    259283#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
    260 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96
     284#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
    261285msgid "Longitude"
    262286msgstr "Долгота"
    … …  
    293317#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
    294318#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
    295 #: ../plugins/terracer/src/terracer/TerracerAction.java:82
    296 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
    297 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
     319#: ../plugins/terracer/src/terracer/TerracerAction.java:72
     320#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
     321#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
    298322#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
    299323#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
    … …  
    327351msgstr "Выделите не менее трёх точек."
    328352
     353#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
     354#, java-format
     355msgid ""
     356"Current number of changes exceeds the max. number of changes, current is "
     357"{0}, max is {1}"
     358msgstr ""
     359
     360#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
     361#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116
     362msgid "API Capabilities Violation"
     363msgstr ""
     364
     365#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
     366msgid "Failed to initialize API. Please try again later."
     367msgstr ""
     368
     369#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
     370#, fuzzy
     371msgid "API initialization failed"
     372msgstr "Не инициализированно"
     373
     374#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
     375#, java-format
     376msgid ""
     377"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
     378"{1}"
     379msgstr ""
     380
     381#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94
     382#, java-format
     383msgid ""
     384"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
     385"length {2}. Values length is {3}."
     386msgstr ""
     387
     388#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
     389#, fuzzy
     390msgid "Precondition Violation"
     391msgstr "Нарушение предварительного условия"
     392
     393#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
     394#, java-format
     395msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
     396msgstr ""
     397
    329398#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
    330399msgid "data"
    … …  
    340409
    341410#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
    342 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223
     411#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
    343412msgid "conflict"
    344413msgstr "конфликт"
    … …  
    421490#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
    422491#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
    423 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
    424 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
     492#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:109
     493#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:301
    425494msgid "Enter values for all conflicts."
    426495msgstr "Введите значения для всех конфликтов."
    … …  
    428497#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
    429498#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
    430 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
     499#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
    431500msgid "Solve Conflicts"
    432501msgstr "Решение конфликтов"
    … …  
    615684#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
    616685msgid "E-Mail"
    617 msgstr ""
     686msgstr "E-Mail"
    618687
    619688#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
    … …  
    651720
    652721#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
    653 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:556
     722#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
    654723#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
    655724#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
    656725#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
    657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
    658 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:559
    659 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:563
     726#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
     727#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
     728#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
    660729#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
    661730#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
    … …  
    685754#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
    686755#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
    687 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
     756#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
    688757#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
    689758#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
    … …  
    718787msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
    719788msgstr ""
     789"Страница справки отсутствует. Создайте её на <A HREF=\"{0}\">английском</A>."
    720790
    721791#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
    … …  
    725795"\">your language</A>."
    726796msgstr ""
    727 
    728 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
    729 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:29
     797"Страница справки отсутствует. Создайте её на <A HREF=\"{0}\"> английском </"
     798"A> или <A HREF=\"{1}\">вашем языке</A>."
     799
     800#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
     801#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
    730802msgid "History of Element"
    731803msgstr "История элемента"
    732804
    733 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:27
    734 msgid "Display history information about OSM ways or nodes."
     805#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
     806#, fuzzy
     807msgid "Display history information about OSM ways, nodes, or relations."
    735808msgstr "Открыть в браузере историю изменений выделенного объекта."
    736809
    737 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:77
    738 msgid ""
    739 "Please select at least one node, way or relation. Only already uploaded "
    740 "elements have a history."
    741 msgstr ""
    742 "Пожалуйста выберите хотя бы один узел, путь или зависимость. Только у уже "
    743 "загруженных элементов есть история."
     810#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
     811#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
     812#, fuzzy
     813msgid "Info about Element"
     814msgstr "История элемента"
     815
     816#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
     817#, fuzzy
     818msgid "Display object information about OSM nodes, ways, or relations."
     819msgstr "Открыть в браузере историю изменений выделенного объекта."
    744820
    745821#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
    … …  
    808884#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
    809885msgid "Mirror selected nodes and ways."
    810 msgstr ""
     886msgstr "Зеркало выбранных узлов и путей."
    811887
    812888#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
    813889msgid "Please select at least one node or way."
    814 msgstr ""
     890msgstr "Пожалуйста, выберите хотябы один узел или путь."
    815891
    816892#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
    … …  
    879955#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54
    880956#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
    881 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54
    882957#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
    883958#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27
    884959#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
    885 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
    886 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43
    887960#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174
    888961#, java-format
    … …  
    10491122#, java-format
    10501123msgid "File {0} exists. Overwrite?"
    1051 msgstr ""
     1124msgstr "Файл {0} существует. Перезаписать?"
    10521125
    10531126#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
    … …  
    10761149
    10771150#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
    1078 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180
     1151#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
    10791152msgid "Conflicts"
    10801153msgstr "Конфликты"
    … …  
    11021175#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
    11031176msgid "Save Layer"
    1104 msgstr ""
     1177msgstr "Сохранить слой"
    11051178
    11061179#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
    … …  
    12381311"линии)"
    12391312
    1240 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:305
     1313#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312
    12411314msgid ""
    12421315"A role based relation membership was copied to all new ways.\n"
    … …  
    12461319"Проверьте, и при необходимости внесите корректировки."
    12471320
    1248 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:310
     1321#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
     1322#, fuzzy
     1323msgid ""
     1324"A relation membership was copied to all new ways.\n"
     1325"You should verify this and correct it when necessary."
     1326msgstr ""
     1327"Участие в отношениях было применено ко всем новым линиям.\n"
     1328"Проверьте, и при необходимости внесите корректировки."
     1329
     1330#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
    12491331#, java-format
    12501332msgid "Split way {0} into {1} parts"
    … …  
    13881470"Не найдено данных для обновления. Вы уже открыли скачанный слой данных?"
    13891471
    1390 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:70
    1391 msgid "Undeleting Way..."
    1392 msgstr ""
    1393 
    1394 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:133
    1395 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:247
    1396 msgid "Yes, undelete them too"
    1397 msgstr ""
    1398 
    1399 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:134
    1400 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:248
    1401 msgid "No, cancel operation"
    1402 msgstr ""
    1403 
    1404 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:138
    1405 #, java-format
    1406 msgid ""
    1407 "<html>There are {0} additional nodes used by way {1}<br>which are deleted on "
    1408 "the server.<br><br>Do you want to undelete these nodes too?</html>"
    1409 msgstr ""
    1410 
    1411 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:143
    1412 msgid "Undelete additional nodes?"
    1413 msgstr ""
    1414 
    1415 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:170
    1416 #, java-format
    1417 msgid "Checking whether node {0} is gone ..."
    1418 msgstr ""
    1419 
    1420 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203
    1421 msgid "Undeleting relation..."
    1422 msgstr ""
    1423 
    1424 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:252
    1425 #, java-format
    1426 msgid ""
    1427 "<html>There are {0} additional primitives referred to by relation {1}"
    1428 "<br>which are deleted on the server.<br><br>Do you want to undelete them too?"
    1429 "</html>"
    1430 msgstr ""
    1431 
    1432 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:257
    1433 msgid "Undelete dependent primitives?"
    1434 msgstr ""
    1435 
    1436 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:284
    1437 #, java-format
    1438 msgid "Checking whether primitive {0} is gone ..."
    1439 msgstr ""
    1440 
    1441 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:339
    1442 msgid "Keep mine"
    1443 msgstr ""
    1444 
    1445 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:340
    1446 msgid "Delete mine"
    1447 msgstr ""
    1448 
    1449 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:344
    1450 #, java-format
    1451 msgid ""
    1452 "<html>The OSM primitive with id <strong>{0}</strong> has been deleted<br>on "
    1453 "the server by another mapper.<br><br>Click <strong>{1}</strong> to keep your "
    1454 "primitive and ignore the deleted state.<br>Your primitive will be assigend a "
    1455 "new id.<br>Click <strong>{2}</strong> to accept the state on the server and "
    1456 "to delete your primitive.<br>Click <strong>{3}</strong> to cancel.<br>"
    1457 msgstr ""
    1458 
    1459 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:356
    1460 msgid "Primitive deleted on the server"
    1461 msgstr ""
    1462 
    1463 #. should not happen
    1464 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:370
    1465 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:344
    1466 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:383
    1467 #, java-format
    1468 msgid "unexpected return value. Got {0}"
    1469 msgstr ""
    1470 
    1471 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:395
     1472#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:58
    14721473msgid "Failed to update the selected primitives."
    1473 msgstr ""
    1474 
    1475 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:396
     1474msgstr "Ошибка обновления выбранного примитива."
     1475
     1476#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:59
    14761477msgid "Update failed"
    1477 msgstr ""
    1478 
    1479 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:408
     1478msgstr "Ошибка обновления"
     1479
     1480#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:71
    14801481#, java-format
    14811482msgid "Could not find primitive with id {0} in the current dataset"
    1482 msgstr ""
    1483 
    1484 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:409
     1483msgstr "Не могу найти примитив с ID {0} в текущем источнике данных"
     1484
     1485#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:72
    14851486msgid "Missing primitive"
    1486 msgstr ""
    1487 
    1488 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:441
    1489 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:445
     1487msgstr "Прошущен примитив"
     1488
     1489#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:103
     1490#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:107
    14901491msgid "Update Selection"
    1491 msgstr ""
    1492 
    1493 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:443
     1492msgstr "Обновить выборку"
     1493
     1494#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:105
    14941495msgid "Updates the currently selected primitives from the server"
    1495 msgstr ""
    1496 
    1497 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:457
     1496msgstr "Обновить выбранные примитивы с сервера"
     1497
     1498#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119
    14981499msgid "There are no selected primitives to update."
    1499 msgstr ""
    1500 
    1501 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:458
     1500msgstr "Не выбраны примитивы для обновления."
     1501
     1502#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
    15021503msgid "Selection empty"
    1503 msgstr ""
    1504 
    1505 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:471
    1506 #, java-format
    1507 msgid ""
    1508 "<html>There are  <strong>{0}</strong> primitives <br>selected for individual "
    1509 "update. Please reduce the selection<br>to max. {1} primitives.</html>"
    1510 msgstr ""
    1511 
    1512 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:476
    1513 msgid "Selection too big"
    1514 msgstr ""
     1504msgstr "Выборка пуста"
    15151505
    15161506#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
    … …  
    15231513msgstr "Загрузить все изменения на OSM"
    15241514
    1525 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
     1515#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
    15261516msgid "Objects to add:"
    15271517msgstr "Новые объекты:"
    15281518
    1529 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
     1519#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
    15301520msgid "Objects to modify:"
    15311521msgstr "Изменённые объекты:"
    15321522
    1533 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
     1523#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
    15341524msgid "Objects to delete:"
    15351525msgstr "Удаляемые объекты:"
    15361526
    1537 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
     1527#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
    15381528msgid "Provide a brief comment for the changes you are uploading:"
    15391529msgstr "Опишите изменения для закачиваемых данных:"
    15401530
    1541 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
     1531#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
    15421532msgid "Upload these changes?"
    15431533msgstr "Загрузить эти изменения?"
    15441534
    1545 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
     1535#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
    15461536msgid "Upload Changes"
    15471537msgstr "Загрузить изменения"
    15481538
    1549 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:152
     1539#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
    15501540msgid "Nothing to upload. Get some data first."
    15511541msgstr "Нечего загружать. Сначала создайте данные."
    15521542
    1553 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
     1543#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
    15541544msgid "There are unresolved conflicts. You have to resolve these first."
    15551545msgstr "Присутствуют неразрешённые конфликты. Для начала, разрешите их"
    15561546
    1557 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
     1547#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
    15581548msgid "No changes to upload."
    15591549msgstr "Нет изменений для загрузки."
    15601550
    1561 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:203
     1551#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
    15621552msgid "Uploading"
    1563 msgstr ""
    1564 
    1565 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
     1553msgstr "Выгрузка"
     1554
     1555#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
    15661556msgid "Updating primitive"
    1567 msgstr ""
    1568 
    1569 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
     1557msgstr "Обновление примитива"
     1558
     1559#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
    15701560#, java-format
    15711561msgid "Synchronize {0} {1} only"
    1572 msgstr ""
    1573 
    1574 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
    1575 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:355
     1562msgstr "Синхронизированы только {0} {1}"
     1563
     1564#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
     1565#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
    15761566msgid "Synchronize entire dataset"
    1577 msgstr ""
    1578 
    1579 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
     1567msgstr "Синхронизировать весь набор данных"
     1568
     1569#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
    15801570#, java-format
    15811571msgid ""
    … …  
    15881578"<strong>{6}</strong> to abort and continue editing.<br></html>"
    15891579msgstr ""
    1590 
    1591 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
    1592 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:370
     1580"<html>Загрузка <strong>прервана</strong> так как на сервере есть более новая "
     1581"версия одной<br>из ваших точек, путей или отношений.<br>Причиной конфликта "
     1582"является <strong>{0}</strong> с id <strong>{1}</strong>,<br>версия данных на "
     1583"сервере {2}, ваша версия {3}.<br><br>Нажмите <strong>{4}</strong> что бы "
     1584"синхронизировать только конфликтный примитив.<br>Нажмите <strong>{5}</"
     1585"strong> что бы синхронизировать весь локальный набор данных с сервером."
     1586"<br>Нажмите <strong>{6}</strong> что бы прекратить и продолжить "
     1587"редактирование.<br></html>"
     1588
     1589#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
     1590#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
    15931591msgid "Conflict detected"
    1594 msgstr ""
    1595 
    1596 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
     1592msgstr "Обнаружен конфликт"
     1593
     1594#. should not happen
     1595#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
     1596#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
     1597#, java-format
     1598msgid "unexpected return value. Got {0}"
     1599msgstr "неожиданное возвращённое значение. Получено {0}"
     1600
     1601#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
    15971602#, java-format
    15981603msgid ""
    … …  
    16021607"<strong>{1}</strong> to abort and continue editing.<br></html>"
    16031608msgstr ""
    1604 
    1605 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:399
     1609"<html><strong>Ошибка </strong>обновления, так как на сервере имеется более "
     1610"новая версия одного <br> из ваших узлов, путей или отношений. <br><br>. "
     1611"Нажмите на <strong>{0}</strong> для синхронизации локальных данных с "
     1612"сервером. <br>  Нажмите <strong>{1}</strong> для прерывания и продолжения "
     1613"редактирования.<br></html>"
     1614
     1615#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
    16061616#, java-format
    16071617msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
    16081618msgstr ""
    1609 
    1610 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
     1619"Предупреждение: заголовок \"{0}\" не соответствует ожидаемой структуре \"{1}"
     1620"\""
     1621
     1622#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
    16111623#, java-format
    16121624msgid ""
    … …  
    16151627"html>"
    16161628msgstr ""
    1617 
    1618 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
     1629"<html><strong>Ошибка</strong> выгрузки данных на сервер, так как  ваши "
     1630"данные<br> противоречат обязательным условиям.<br> Сообщение об ошибке: <br>"
     1631"{0}</html>"
     1632
     1633#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
    16191634msgid "Precondition violation"
    1620 msgstr ""
    1621 
    1622 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:452
     1635msgstr "Нарушение предварительного условия"
     1636
     1637#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
    16231638#, java-format
    16241639msgid ""
    … …  
    16271642"<br>{0}</html>"
    16281643msgstr ""
    1629 
    1630 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:463
     1644"<html><strong>Ошибка</strong>при выгрузке данных, примитив который вы "
     1645"пытаетесь удалить <br>уже удаленн с сервера.<br><br>Сообщение об ошибке:<br>"
     1646"{0}</html>"
     1647
     1648#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
    16311649msgid "Primitive already deleted"
    1632 msgstr ""
    1633 
    1634 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:484
    1635 #, java-format
    1636 msgid "Error header \"{0}\" doesn't match expected pattern \"{1}\""
    1637 msgstr ""
    1638 
    1639 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:539
     1650msgstr "Примитив уже удален"
     1651
     1652#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
     1653#, java-format
     1654msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
     1655msgstr "Заголовок \"{0}\" не соответствуетожидаемой структуре \"{1}\""
     1656
     1657#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
    16401658msgid "Upload to OSM API failed"
    1641 msgstr ""
    1642 
    1643 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:552
     1659msgstr "Ошибка выгрузки в OSM API"
     1660
     1661#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
    16441662#, java-format
    16451663msgid ""
    … …  
    16471665"Check the server URL in your preferences and your internet connection."
    16481666msgstr ""
     1667"Ошибка создания подключения к серверу OSM {0}.\n"
     1668"Проверьте в настройках URL сервера  и наличие подключения к сети Internet."
    16491669
    16501670#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
    … …  
    17611781msgstr "Данные OpenStreetMap"
    17621782
    1763 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
     1783#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
    17641784msgid "Data Layer"
    17651785msgstr "Слой данных"
    17661786
    1767 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:55
     1787#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
    17681788#, java-format
    17691789msgid "Download {0} of {1} ({2} left)"
    17701790msgstr "Скачивание {0} из {1} ({2} осталось)"
    17711791
     1792#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94
     1793msgid "The following errors occurred during mass download:"
     1794msgstr "Следующие ошибки произошли во время массового скачивания:"
     1795
    17721796#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:95
    1773 msgid "The following errors occurred during mass download:"
    1774 msgstr ""
    1775 
    1776 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:96
    17771797msgid "Errors during Download"
    17781798msgstr "Ошибка в течение загрузки"
    17791799
    1780 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:135
     1800#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:134
    17811801#, java-format
    17821802msgid ""
    17831803"<html>There are {0} primitives in your local dataset which<br>might be "
    1784 "deleted on the server. If you later try to delete or<br>update them on the "
    1785 "server the server is likely to report a<br>conflict.<br><br>Click <strong>{1}"
    1786 "</strong> to check these primitives individually.<br>Click <strong>{2}</"
    1787 "strong> to ignore.<br></html>"
     1804"deleted on the server. If you later try to delete or<br>update them the "
     1805"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
     1806"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
     1807"</strong> to ignore.<br></html>"
    17881808msgstr ""
    17891809
    17901810#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:150
    17911811msgid "Deleted or moved primitives"
    1792 msgstr ""
     1812msgstr "Удалённые или перемещённые примитивы"
    17931813
    17941814#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45
    … …  
    19341954#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
    19351955#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
    1936 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
     1956#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
    19371957#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
    19381958#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
    … …  
    21742194msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
    21752195msgstr ""
     2196"Ключ не может быть пустым при использовании тэга оператора. Пример "
     2197"использования: ключ=значение"
    21762198
    21772199#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355
    … …  
    21792201msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
    21802202msgstr ""
     2203"Неизвестный тип примитива: {0}. Разрешенные значения точка, линия или связь"
    21812204
    21822205#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493
    21832206#, java-format
    21842207msgid "Unexpected token: {0}"
    2185 msgstr ""
     2208msgstr "Неожиданный знак: {0}"
    21862209
    21872210#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514
    … …  
    21992222#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592
    22002223msgid "Wrong number of parameters for nodes operator."
    2201 msgstr ""
     2224msgstr "Неверное число параметров для оператора точек."
    22022225
    22032226#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
    … …  
    22072230"nodes or range, for example nodes:10-20"
    22082231msgstr ""
     2232"Неверное значение оператора точек: {0}. Оператор точек ожидает число. точек "
     2233"или диапазон, например, 10-20"
    22092234
    22102235#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602
    22112236#, java-format
    22122237msgid "Incorrect value of id operator: {0}. Number is expected."
    2213 msgstr ""
     2238msgstr "Неверное значение id оператора: {0}. Ожидалось число."
    22142239
    22152240#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34
    … …  
    22402265#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
    22412266msgid "Error while communicating with server."
    2242 msgstr ""
     2267msgstr "Ошибка  связи с сервером."
    22432268
    22442269#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
    … …  
    22952320msgstr ""
    22962321
    2297 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78
    2298 #, java-format
    2299 msgid "Resolve {0} conflicts in {1} objects"
    2300 msgstr "Разрешить {0} конфликтов в {1} объектах"
    2301 
    23022322#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
    23032323#, java-format
    23042324msgid "Resolve conflicts in coordinates in {0}"
    2305 msgstr ""
     2325msgstr "Решите конфликт в координатах в {0}"
    23062326
    23072327#. should not happen
    23082328#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
    2309 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73
     2329#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
    23102330msgid "cannot resolve undecided conflict"
    23112331msgstr ""
    … …  
    23682388#, java-format
    23692389msgid "Resolve conflicts in deleted state in {0}"
    2370 msgstr ""
     2390msgstr "Разрешить конфликт при удалении {0}"
    23712391
    23722392#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
    … …  
    23762396#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
    23772397#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
    2378 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112
     2398#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
    23792399#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
    23802400#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
    … …  
    23882408msgstr[2] "узлов"
    23892409
    2390 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:157
     2410#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
    23912411msgid "Purging 1 primitive"
    23922412msgstr ""
    23932413
    23942414#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188
     2415#, java-format
     2416msgid "removing reference from way {0}"
     2417msgstr ""
     2418
     2419#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194
    23952420#, java-format
    23962421msgid ""
    … …  
    23992424msgstr ""
    24002425
     2426#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
     2427#, fuzzy, java-format
     2428msgid "removing reference from relation {0}"
     2429msgstr "Удалить Элементы из Отношений"
     2430
    24012431#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
    24022432#, java-format
    … …  
    24212451msgstr ""
    24222452
    2423 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
     2453#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:69
    24242454#, java-format
    24252455msgid "Undelete {0} primitives"
    24262456msgstr ""
    24272457
    2428 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:44
     2458#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
    24292459#, java-format
    24302460msgid "Resolve version conflicts for {0} {1}"
    … …  
    24402470msgstr "Применить?"
    24412471
    2442 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141
     2472#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:142
    24432473msgid ""
    24442474"When reversing this way, the following changes to properties of the way and "
    … …  
    25292559msgstr "Невозможно скачать параметры с сервера."
    25302560
    2531 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
    2532 msgid "different"
    2533 msgstr "различный"
    2534 
    2535 #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
    2536 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
    2537 msgid "deleted"
    2538 msgstr "удалён"
    2539 
    2540 #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
    2541 msgid "true"
    2542 msgstr "истина"
    2543 
    2544 #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
    2545 msgid "false"
    2546 msgstr "ложь"
    2547 
    2548 #: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
    2549 msgid "position"
    2550 msgstr "положение"
    2551 
    25522561#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
    25532562msgid "Decimal Degrees"
    … …  
    25742583msgstr "В"
    25752584
    2576 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:287
     2585#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288
    25772586#, java-format
    25782587msgid "parameter {0} > 0 required. Got {1}."
    25792588msgstr ""
    25802589
    2581 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108
    2582 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:84
    2583 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115
     2590#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
     2591#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
     2592#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
    25842593msgid "incomplete"
    25852594msgstr "неполный"
    25862595
    2587 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
     2596#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48
    25882597#, java-format
    25892598msgid "Error: {0}"
    25902599msgstr "Ошибка: {0}"
    25912600
    2592 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
     2601#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48
    25932602#, java-format
    25942603msgid "Warning: {0}"
    … …  
    25972606#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
    25982607msgid "nodes"
    2599 msgstr ""
     2608msgstr "точки"
    26002609
    26012610#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
    … …  
    26152624
    26162625#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
    2617 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:88
     2626#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:99
    26182627#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69
    26192628#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
    … …  
    26272636#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
    26282637msgid "relations"
    2629 msgstr ""
     2638msgstr "отношения"
    26302639
    26312640#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
    … …  
    26472656msgstr ""
    26482657
    2649 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:107
     2658#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:118
    26502659#, java-format
    26512660msgid "{0} member"
    … …  
    26552664msgstr[2] "{0} участников"
    26562665
    2657 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:121
     2666#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:136
    26582667msgid "highway"
    26592668msgstr "дорога"
    26602669
    2661 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
     2670#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:137
    26622671#: build/trans_presets.java:2994
    26632672msgid "railway"
    26642673msgstr "железная дорога"
    26652674
    2666 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123
     2675#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138
    26672676msgid "waterway"
    26682677msgstr "водоёмы"
    26692678
    2670 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:124
     2679#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:139
    26712680msgid "landuse"
    26722681msgstr "землепользование"
    26732682
    2674 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
     2683#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:143
    26752684#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323
    26762685#, java-format
    … …  
    26832692#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153
    26842693msgid "There's no primitive with version {0} in this history"
    2685 msgstr ""
     2694msgstr "В этой истории не существует примитива версии {0}"
    26862695
    26872696#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:160
    … …  
    26932702#, java-format
    26942703msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
    2695 msgstr ""
     2704msgstr "параметр ''{0}'' должен быть в интервале 0..{1}, текущее значение {2}"
    26962705
    26972706#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179
    26982707msgid "no earliest version found. History is empty."
    2699 msgstr ""
     2708msgstr "более ранняя версия не найдена. История пуста."
    27002709
    27012710#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185
    27022711msgid "no latest version found. History is empty."
    2703 msgstr ""
     2712msgstr "более поздняя версия не найдена. История пуста."
    27042713
    27052714#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
    27062715msgid "Didn't find an  primitive with id {0} in this dataset"
    2707 msgstr ""
     2716msgstr "Примитив  с id {0} не был найден в этом наборе данных"
    27082717
    27092718#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
    27102719msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
    2711 msgstr ""
     2720msgstr "Примитив  с id {0} и версией {1} не был найден в этом наборе данных"
    27122721
    27132722#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
    … …  
    27192728#, java-format
    27202729msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
    2721 msgstr ""
     2730msgstr "параметр ''{0}'' должен быть > 0, текущее значение ''{1}''"
    27222731
    27232732#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
    27242733#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
    27252734#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
     2735#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
     2736#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
     2737#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
    27262738#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
    27272739#, java-format
    27282740msgid "parameter ''{0}'' must not be null"
    2729 msgstr ""
     2741msgstr "параметр ''{0}'' не должен быть null"
    27302742
    27312743#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
    27322744msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
    2733 msgstr ""
     2745msgstr "невозможно сравнить примитив с id ''{0}'' и примитив с id ''{1}''"
    27342746
    27352747#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
    … …  
    27372749#, java-format
    27382750msgid "parameter {0} not in range 0..{1}, got {2}"
    2739 msgstr ""
     2751msgstr "параметр {0} не в интервале 0..{1}, текущее значение {2}"
    27402752
    27412753#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
    … …  
    28652877msgstr "текст"
    28662878
     2879#. should not happen
     2880#.
     2881#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
     2882#, java-format
     2883msgid ""
     2884"My primitive with id {0} and version {1} is visible although their primitive "
     2885"with lower version {2} is not visible. Can't deal with this inconsistency. "
     2886"Keeping my primitive. "
     2887msgstr ""
     2888
    28672889#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
    28682890#, java-format
    … …  
    28832905
    28842906#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
    2885 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231
     2907#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
    28862908#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
    28872909msgid "background"
    … …  
    29662988msgstr "Невозможно записать закладки"
    29672989
    2968 #. setting up the properties table
    2969 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78
    2970 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
    2971 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
    2972 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
    2973 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
    2974 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
    2975 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
    2976 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
    2977 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
    2978 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
    2979 msgid "Key"
    2980 msgstr "Ключ"
    2981 
    2982 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78
    2983 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
    2984 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
    2985 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
    2986 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
    2987 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
    2988 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
    2989 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
    2990 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
    2991 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
    2992 msgid "Value"
    2993 msgstr "Значение"
    2994 
    2995 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:224
    2996 #, java-format
    2997 msgid "{0} object has conflicts:"
    2998 msgid_plural "{0} objects have conflicts:"
    2999 msgstr[0] "{0} объект имеет конфликты."
    3000 msgstr[1] "{0} объекта имеет конфликты."
    3001 msgstr[2] "{0} объектов имеет конфликты."
    3002 
    3003 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:227
    3004 msgid "my version:"
    3005 msgstr "моя версия:"
    3006 
    3007 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:233
    3008 msgid "their version:"
    3009 msgstr "их версия:"
    3010 
    3011 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:239
    3012 msgid "resolved version:"
    3013 msgstr "Разрешённая версия:"
    3014 
    30152990#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
    30162991msgid "Message of the day not available"
    … …  
    31933168"используется."
    31943169
    3195 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
     3170#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
    31963171msgid "File"
    31973172msgstr "Файл"
    31983173
    3199 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
     3174#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152
    32003175msgid "View"
    32013176msgstr "Вид"
    32023177
    3203 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
     3178#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153
    32043179msgid "Tools"
    32053180msgstr "Инструменты"
    32063181
    3207 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152
     3182#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154
    32083183#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
    32093184msgid "Presets"
    32103185msgstr "Шаблоны"
    32113186
    3212 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
     3187#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
    32133188#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
    32143189#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
    … …  
    32213196
    32223197#. TODO move code to an "action" like the others?
    3223 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:219
     3198#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
    32243199msgid "Wireframe View"
    32253200msgstr "Каркас"
    32263201
    3227 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
     3202#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223
    32283203msgid "Toggle Wireframe view"
    32293204msgstr "Показать/скрыть каркас"
    32303205
    3231 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
     3206#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
    32323207msgid "Full Screen"
    32333208msgstr "Полноэкранный режим"
    32343209
    3235 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
     3210#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251
    32363211msgid "Toggle Full Screen view"
    32373212msgstr "Переключить в Полноэкранный режим"
    32383213
    3239 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
     3214#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292
    32403215msgid "Audio"
    32413216msgstr "Аудио"
    … …  
    33503325#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
    33513326msgid "My with Their"
    3352 msgstr ""
     3327msgstr "Мою с их"
    33533328
    33543329#. *
    … …  
    33573332#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
    33583333msgid "My with Merged"
    3359 msgstr ""
     3334msgstr "Мою с объединённой"
    33603335
    33613336#. *
    … …  
    33643339#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
    33653340msgid "Their with Merged"
    3366 msgstr ""
     3341msgstr "Их с объединённой"
    33673342
    33683343#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
    … …  
    33713346msgstr ""
    33723347
    3373 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63
    3374 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124
     3348#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64
     3349#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125
    33753350msgid "Properties"
    3376 msgstr ""
    3377 
    3378 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68
    3379 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93
     3351msgstr "Параметры"
     3352
     3353#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
     3354#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
    33803355#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
    33813356#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
    … …  
    33833358msgstr "Тэги"
    33843359
    3385 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73
    3386 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163
     3360#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
     3361#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
    33873362msgid "Nodes"
    3388 msgstr ""
    3389 
    3390 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78
    3391 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158
     3363msgstr "Точки"
     3364
     3365#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
     3366#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
    33923367#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
    33933368msgid "Members"
    33943369msgstr "Участники"
    33953370
    3396 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
     3371#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
    33973372msgid "No pending tag conflicts to be resolved"
    33983373msgstr ""
    33993374
    3400 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97
     3375#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98
    34013376#, java-format
    34023377msgid "Tags({0} conflicts)"
    3403 msgstr ""
    3404 
    3405 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98
     3378msgstr "Тэги({0} конфликтов)"
     3379
     3380#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99
    34063381#, java-format
    34073382msgid "{0} pending tag conflicts to be resolved"
    34083383msgstr ""
    34093384
    3410 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104
     3385#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105
    34113386msgid "Nodes(resolved)"
    3412 msgstr ""
    3413 
    3414 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105
     3387msgstr "Точки(решённые)"
     3388
     3389#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
    34153390msgid ""
    34163391"Merged node list frozen. No pending conflicts in the node list of this way"
    34173392msgstr ""
    34183393
    3419 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:108
     3394#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109
    34203395msgid "Nodes(with conflicts)"
    34213396msgstr ""
    34223397
    3423 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109
     3398#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110
    34243399msgid "Pending conflicts in the node list of this way"
    34253400msgstr ""
    34263401
    3427 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113
     3402#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114
    34283403msgid "Members(resolved)"
    34293404msgstr ""
    34303405
    3431 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114
     3406#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115
    34323407msgid ""
    34333408"Merged member list frozen. No pending conflicts in the member list of this "
    … …  
    34353410msgstr ""
    34363411
    3437 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:117
     3412#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118
    34383413msgid "Members(with conflicts)"
    34393414msgstr ""
    34403415
    3441 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118
     3416#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119
    34423417msgid "Pending conflicts in the member list of this relation"
    34433418msgstr ""
    34443419
    3445 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125
     3420#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126
    34463421msgid "No pending property conflicts"
    34473422msgstr ""
    34483423
    3449 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128
     3424#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129
    34503425msgid "Properties(with conflicts)"
    34513426msgstr ""
    34523427
    3453 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129
     3428#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130
    34543429msgid "Pending property conflicts to be resolved"
    34553430msgstr ""
    34563431
    3457 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
     3432#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207
    34583433msgid "Conflict Resolution"
    34593434msgstr ""
    … …  
    34903465
    34913466#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
    3492 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:75
     3467#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81
    34933468msgid "My version"
    34943469msgstr ""
    … …  
    34993474
    35003475#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
    3501 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81
     3476#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87
    35023477#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
    35033478msgid "Merged version"
    … …  
    35113486
    35123487#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
    3513 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87
     3488#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93
    35143489msgid "Their version"
    35153490msgstr ""
    … …  
    36943669msgstr ""
    36953670
    3696 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76
     3671#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
     3672#, fuzzy, java-format
     3673msgid ""
     3674"<html>An error occurred while communicating with the server<br>Details: {0}</"
     3675"html>"
     3676msgstr "Ошибка  связи с сервером."
     3677
     3678#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
     3679#, fuzzy
     3680msgid "Communication with server failed"
     3681msgstr "Ошибка  связи с сервером."
     3682
     3683#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
     3684#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505
     3685msgid "Yes, undelete them too"
     3686msgstr "Да, восстановить их тоже"
     3687
     3688#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477
     3689#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
     3690msgid "No, cancel operation"
     3691msgstr "Нет, отменить действие"
     3692
     3693#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481
     3694#, java-format
     3695msgid ""
     3696"<html>There are {0} additional nodes used by way {1}<br>which are deleted on "
     3697"the server.<br><br>Do you want to undelete these nodes too?</html>"
     3698msgstr ""
     3699"<html>Существует {0} дополнительных узлов используемых треком  {1} <br>, "
     3700"которые удалены на сервере. <br><br> Вы хотите восстановить эти узлы тоже?</"
     3701"html>"
     3702
     3703#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486
     3704msgid "Undelete additional nodes?"
     3705msgstr "Восстановить дополнительные узлы?"
     3706
     3707#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510
     3708#, java-format
     3709msgid ""
     3710"<html>There are {0} additional primitives referred to by relation {1}"
     3711"<br>which are deleted on the server.<br><br>Do you want to undelete them too?"
     3712"</html>"
     3713msgstr ""
     3714"<html>Существует {0}  дополнительных примитива связанных с отношением {1}"
     3715"<br>, которые удалены с сервера. <br><br>Вы хотите восстановить их тоже?</"
     3716"html>"
     3717
     3718#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515
     3719msgid "Undelete dependent primitives?"
     3720msgstr "Восстановить связанные примитивы?"
     3721
     3722#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
    36973723msgid "Properties in my dataset, i.e. the local dataset"
    36983724msgstr ""
    36993725
    3700 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
     3726#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
    37013727msgid ""
    37023728"Properties in the merged element. They will replace properties in my "
    … …  
    37043730msgstr ""
    37053731
    3706 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
     3732#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
    37073733msgid "Properties in their dataset, i.e. the server dataset"
    37083734msgstr ""
    37093735
    3710 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:101
     3736#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110
    37113737msgid "Coordinates:"
    37123738msgstr ""
    37133739
    3714 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:174
     3740#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186
    37153741msgid "Deleted State:"
    37163742msgstr ""
    37173743
    3718 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:248
    3719 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:260
     3744#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263
     3745msgid "Visible State:"
     3746msgstr ""
     3747
     3748#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343
     3749#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355
     3750#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364
     3751#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373
    37203752#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
    37213753msgid "(none)"
    37223754msgstr "(отсутствует)"
    37233755
    3724 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
     3756#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357
     3757msgid "deleted"
     3758msgstr "удалён"
     3759
     3760#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359
    37253761msgid "not deleted"
    37263762msgstr ""
    37273763
    3728 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:334
     3764#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
     3765#, fuzzy
     3766msgid "visible (on the server)"
     3767msgstr "Примитив удаляется на сервере"
     3768
     3769#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
     3770#, fuzzy
     3771msgid "not visible (on the server)"
     3772msgstr "Примитив удаляется на сервере"
     3773
     3774#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
     3775#, fuzzy
     3776msgid "Keep a clone of the local version"
     3777msgstr "Пожалуйста, введите название места."
     3778
     3779#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
     3780msgid "Physically delete from local dataset"
     3781msgstr ""
     3782
     3783#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476
    37293784msgid "Keep my coordiates"
    37303785msgstr ""
    37313786
    3732 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:349
     3787#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491
    37333788msgid "Keep their coordiates"
    37343789msgstr ""
    37353790
    3736 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364
     3791#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506
    37373792msgid "Undecide conflict between different coordinates"
    37383793msgstr ""
    37393794
    3740 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:379
     3795#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521
    37413796msgid "Keep my deleted state"
    37423797msgstr ""
    37433798
    3744 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:394
     3799#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536
    37453800msgid "Keep their deleted state"
    37463801msgstr ""
    37473802
    3748 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:409
     3803#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551
    37493804msgid "Undecide conflict between deleted state"
     3805msgstr ""
     3806
     3807#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
     3808msgid "Keep my visible state"
     3809msgstr ""
     3810
     3811#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
     3812#, fuzzy
     3813msgid "Yes, reset the id"
     3814msgstr "Да, восстановить их тоже"
     3815
     3816#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
     3817#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
     3818#, fuzzy
     3819msgid "No, abort"
     3820msgstr "Без даты"
     3821
     3822#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
     3823#, java-format
     3824msgid ""
     3825"<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} to "
     3826"0.<br>On the next upload the server will assign<br>it a new id.<br>Do yo "
     3827"agree?</html>"
     3828msgstr ""
     3829
     3830#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594
     3831msgid "Reset id to 0"
     3832msgstr ""
     3833
     3834#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
     3835msgid "Keep their visible state"
     3836msgstr ""
     3837
     3838#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
     3839msgid "Yes, purge it"
     3840msgstr ""
     3841
     3842#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
     3843#, java-format
     3844msgid ""
     3845"<html>JOSM will have to remove your local primitive with id {0}<br>from the "
     3846"dataset.<br>Do you agree?</html>"
     3847msgstr ""
     3848
     3849#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
     3850#, fuzzy
     3851msgid "Remove from dataset"
     3852msgstr "убрать из выделения"
     3853
     3854#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
     3855msgid "Undecide conflict between visible state"
    37503856msgstr ""
    37513857
    … …  
    37903896msgstr ""
    37913897
     3898#. setting up the properties table
     3899#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
     3900#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
     3901#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
     3902#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
     3903#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
     3904#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
     3905#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
     3906#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
     3907#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
     3908msgid "Key"
     3909msgstr "Ключ"
     3910
     3911#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
     3912#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
     3913#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
     3914#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
     3915#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
     3916#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
     3917#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
     3918#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
     3919#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
     3920msgid "Value"
     3921msgstr "Значение"
     3922
    37923923#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108
    37933924msgid "cannot apply undecided tag merge item"
    … …  
    38463977
    38473978#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
    3848 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
     3979#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
    38493980#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
    38503981#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
    … …  
    38683999msgstr "Стек команд: {0}"
    38694000
    3870 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55
     4001#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
    38714002#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
    38724003#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
    … …  
    38754006msgstr "Выбрать на карте объекты, выбранные в списке вверху."
    38764007
    3877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
     4008#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
    38784009msgid "Resolve"
    38794010msgstr "Разрешить"
    38804011
    3881 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65
     4012#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
    38824013msgid "Open a merge dialog of all selected items in the list above."
    38834014msgstr "Открыть диалоговое окно для слияния выбранных объектов."
    38844015
    3885 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
    3886 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
     4016#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
     4017#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
    38874018msgid "Conflict"
    38884019msgstr "Конфликт"
    38894020
    3890 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
     4021#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
    38914022msgid "Merging conflicts."
    38924023msgstr "Разрешение конфликтов."
    38934024
    3894 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
    3895 msgid "WARNING: unexpected value for preference conflict.resolution, got "
    3896 msgstr ""
    3897 
    3898 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159
    3899 msgid "Resolve Conflicts"
    3900 msgstr "Разрешить конфликты"
    3901 
    3902 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161
    3903 msgid "Solve Conflict"
    3904 msgstr "Разрешить конфликт"
    3905 
    3906 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178
     4025#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
    39074026#, java-format
    39084027msgid "Conflicts: {0}"
    39094028msgstr "Конфликты: {0}"
    39104029
    3911 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129
     4030#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
    39124031msgid "Resolve conflicts"
    39134032msgstr ""
    39144033
    3915 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150
     4034#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151
    39164035msgid "Cancel conflict resolution and close the dialog"
    39174036msgstr ""
    39184037
    3919 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164
     4038#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165
    39204039msgid "Apply resolved conflicts and close the dialog"
    39214040msgstr ""
    39224041
    3923 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165
     4042#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166
    39244043msgid "Apply Resolution"
    39254044msgstr ""
    39264045
    3927 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173
     4046#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174
    39284047msgid "Apply partial resolutions"
    39294048msgstr ""
    39304049
    3931 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174
     4050#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175
    39324051msgid "Continue resolving"
    39334052msgstr ""
    39344053
    3935 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176
     4054#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177
    39364055#, java-format
    39374056msgid ""
    … …  
    39414060"resolving conflicts.</html>"
    39424061msgstr ""
    3943 
    3944 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:182
    3945 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256
    3946 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
    3947 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
    3948 msgid "Warning"
    3949 msgstr "Предупреждение"
    39504062
    39514063#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
    … …  
    43764488#. item "Amenities/Toilets" combo "Fee"
    43774489#. item "Health/Pharmacy" combo "Dispensing"
    4378 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:418
     4490#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
    43794491#: build/trans_presets.java:312 build/trans_presets.java:313
    43804492#: build/trans_presets.java:314 build/trans_presets.java:315
    … …  
    43994511msgstr "да"
    44004512
    4401 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:418
     4513#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
    44024514#: build/trans_presets.java:312 build/trans_presets.java:313
    44034515#: build/trans_presets.java:314 build/trans_presets.java:315
    … …  
    44244536msgstr "нет"
    44254537
    4426 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:423
     4538#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
    44274539#, java-format
    44284540msgid "Members: {0}"
    44294541msgstr "Участники: {0}"
    44304542
    4431 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:431
     4543#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
    44324544#, java-format
    44334545msgid "Relation Editor: {0}"
    44344546msgstr "Редактор отношений: {0}"
    44354547
    4436 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:545
     4548#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
    44374549msgid "There were conflicts during import."
    44384550msgstr "При импортировании возникли конфликтные ситуации."
    44394551
    4440 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:555
     4552#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
    44414553msgid "Error parsing server response."
    44424554msgstr "Ошибка при разборе ответа от сервера."
    44434555
    4444 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:558
     4556#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
    44454557msgid "Cannot connect to server."
    44464558msgstr "Невозможно связаться с сервером."
    44474559
    4448 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562
     4560#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
    44494561msgid "Error when communicating with server."
    44504562msgstr ""
    … …  
    46274739msgstr "масштаб"
    46284740
    4629 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110
     4741#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113
    46304742msgid "Slippy map"
    46314743msgstr "Интерактивная карта"
    … …  
    46524764msgstr "Номера квадратов"
    46534765
    4654 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
     4766#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
    46554767#, java-format
    46564768msgid "Images for {0}"
    46574769msgstr "Изображения для {0}"
    46584770
    4659 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:103
     4771#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
    46604772msgid "Read GPX..."
    46614773msgstr "Прочесть GPX"
    46624774
    4663 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:112
     4775#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
    46644776#, java-format
    46654777msgid "No time for point {0} x {1}"
    46664778msgstr "Нет указания времени для точки {0} x {1}"
    46674779
    4668 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:117
     4780#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
    46694781#, java-format
    46704782msgid "Cannot read time \"{0}\" from point {1} x {2}"
    46714783msgstr "Невозможно прочесть время \"{0}\" у точки  {1} x {2}"
    46724784
    4673 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
     4785#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
    46744786msgid "No images with readable timestamps found."
    46754787msgstr "Не найдено изображений с информацией о времени."
    46764788
    4677 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:136
     4789#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
    46784790#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
    46794791#, java-format
    … …  
    46814793msgstr "Чтение {0}..."
    46824794
    4683 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:203
     4795#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
    46844796#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
    46854797msgid "Geotagged Images"
    46864798msgstr "Изображения с данными о местоположении"
    46874799
    4688 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:255
    4689 #, java-format
    4690 msgid "Image with path {0} does not exist or is not readable."
    4691 msgstr "Картинка {0}  не существует или произошла ошибка чтения."
    4692 
    4693 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363
     4800#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
    46944801#, java-format
    46954802msgid "GPS start: {0}"
    46964803msgstr "Начало GPS: {0}"
    46974804
    4698 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:364
     4805#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
    46994806#, java-format
    47004807msgid "GPS end: {0}"
    47014808msgstr "Конец GPS: {0}"
    47024809
    4703 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:366
     4810#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
    47044811#, java-format
    47054812msgid "current delta: {0}s"
    47064813msgstr "текущая разница: {0} с."
    47074814
    4708 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:367
     4815#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
    47094816msgid "timezone difference: "
    47104817msgstr "разница в часовых поясах: "
    47114818
    4712 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:391
     4819#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
    47134820#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
    47144821msgid "image"
    … …  
    47184825msgstr[2] "изображений"
    47194826
    4720 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:391
     4827#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
    47214828#, java-format
    47224829msgid "{0} within the track."
    47234830msgstr "{0} в пределах трека"
    47244831
    4725 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
     4832#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
    47264833msgid "Sync clock"
    47274834msgstr "Синхронизация часов"
    47284835
    4729 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443
     4836#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
    47304837#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
    47314838#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
    … …  
    47334840msgstr "Изображения JPEG (*.jpg)"
    47344841
    4735 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:489
     4842#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
    47364843#, java-format
    47374844msgid "The date in file \"{0}\" could not be parsed."
    47384845msgstr "Невозможно прочесть дату из файла \"{0}\""
    47394846
    4740 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:493
     4847#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
    47414848#, java-format
    47424849msgid "There is no EXIF time within the file \"{0}\"."
    47434850msgstr "EXIF файла \"{0}\" не содержит информации о времени."
    47444851
    4745 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:497
     4852#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
    47464853msgid "Image"
    47474854msgstr "Изображение"
    47484855
    4749 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:499
     4856#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
    47504857msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
    47514858msgstr "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)"
    47524859
    4753 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:502
     4860#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
    47544861msgid "GPS unit timezone (difference to photo)"
    47554862msgstr "Часовой пояс GPS объекта (отличается от фотографии)"
    47564863
    4757 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:510
     4864#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
    47584865msgid "Synchronize Time with GPS Unit"
    47594866msgstr "Синхронизировать время с GPS приёмником"
    47604867
    4761 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:526
    4762 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:528
     4868#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
     4869#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
    47634870msgid "Time entered could not be parsed."
    47644871msgstr "Введённое время невозможно использовать"
    … …  
    49135020
    49145021#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
    4915 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
     5022#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
    49165023#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
    49175024#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
    … …  
    49835090msgstr "версия {0}"
    49845091
    4985 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
     5092#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
    49865093msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
    49875094msgstr ""
    49885095
    4989 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280
     5096#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
    49905097#, java-format
    49915098msgid "There were {0} conflicts during import."
    49925099msgstr ""
    49935100
    4994 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:388
     5101#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
    49955102#, java-format
    49965103msgid "{0} consists of:"
    49975104msgstr "{0} состоит из:"
    49985105
    4999 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:392
     5106#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
    50005107#, java-format
    50015108msgid " ({0} deleted.)"
    50025109msgstr " ({0} удалено)"
    50035110
    5004 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
     5111#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
    50055112msgid "unset"
    50065113msgstr "отключено"
    50075114
    5008 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
     5115#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
    50095116#, java-format
    50105117msgid "API version: {0}"
    50115118msgstr "Версия API: {0}"
    50125119
    5013 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
     5120#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
    50145121#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
    50155122msgid "Convert to GPX layer"
    … …  
    62306337#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
    62316338msgid "Set all to default"
    6232 msgstr "Задать все в значение по усмолчанию"
     6339msgstr "Задать все значения по умолчанию"
    62336340
    62346341#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
    … …  
    62416348
    62426349#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
    6243 #: ../plugins/terracer/src/terracer/TerracerAction.java:422
    6244 #: ../plugins/terracer/src/terracer/TerracerAction.java:440
    6245 #: ../plugins/terracer/src/terracer/TerracerAction.java:504
     6350#: ../plugins/terracer/src/terracer/TerracerAction.java:412
     6351#: ../plugins/terracer/src/terracer/TerracerAction.java:430
     6352#: ../plugins/terracer/src/terracer/TerracerAction.java:494
    62466353msgid "All"
    62476354msgstr "Все"
    … …  
    69897096
    69907097#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
    6991 #: ../plugins/terracer/src/terracer/TerracerAction.java:108
     7098#: ../plugins/terracer/src/terracer/TerracerAction.java:98
    69927099#, java-format
    69937100msgid "Change {0} object"
    … …  
    69987105
    69997106#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
    7000 #: ../plugins/terracer/src/terracer/TerracerAction.java:110
     7107#: ../plugins/terracer/src/terracer/TerracerAction.java:100
    70017108msgid "Nothing selected!"
    70027109msgstr "Ничего не выбрано!"
    … …  
    70327139
    70337140#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102
     7141#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319
     7142#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345
    70347143#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33
    70357144#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49
    … …  
    70477156msgstr "Подготовка данных..."
    70487157
    7049 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21
     7158#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
    70507159msgid "GPX Files"
    70517160msgstr "GPS файлы"
    70527161
    7053 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48
     7162#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49
    70547163#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
     7164#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
    70557165#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
    70567166#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
    … …  
    70587168msgid "Markers from {0}"
    70597169msgstr "Маркеры из {0}"
     7170
     7171#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
     7172#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
     7173#, fuzzy, java-format
     7174msgid "File \"{0}\" does not exist"
     7175msgstr "Файл {0} существует. Перезаписать?"
     7176
     7177#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
     7178#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43
     7179#, java-format
     7180msgid "Parsing file \"{0}\" failed"
     7181msgstr ""
    70607182
    70617183#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
    … …  
    70637185msgstr "Ошибка разбора: неправильная структура документа gpx"
    70647186
     7187#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
     7188#, java-format
     7189msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
     7190msgstr ""
     7191
     7192#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376
     7193#, java-format
     7194msgid "Server replied with response code 404 for id {0}. Skipping."
     7195msgstr ""
     7196
     7197#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
     7198msgid ""
     7199"Server replied with response code 404, retrying with an individual request "
     7200"for each primitive"
     7201msgstr ""
     7202
    70657203#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
    70667204msgid "NMEA-0183 Files"
    … …  
    70687206
    70697207#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
     7208#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
    70707209msgid "Coordinates imported: "
    70717210msgstr "Координаты импортированы: "
    … …  
    71387277msgstr "Закрывается список правок..."
    71397278
    7140 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314
     7279#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
    71417280msgid "No changeset present for diff upload"
    71427281msgstr "Нет изменений для выгрузки"
    71437282
    7144 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321
     7283#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320
    71457284msgid "Preparing..."
    71467285msgstr "Подготовка..."
    71477286
    7148 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
     7287#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
    71497288msgid "Uploading..."
    71507289msgstr "Закачка..."
    … …  
    72397378msgstr "OSM файлы сервера"
    72407379
    7241 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
     7380#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166
    72427381msgid "Unknown version"
    72437382msgstr "Неизвестная версия"
    72447383
    7245 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
     7384#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169
    72467385msgid "Version number missing from OSM data"
    72477386msgstr "Номер версии отсутствует по  данным OSM"
    72487387
    7249 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
     7388#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
    72507389#, java-format
    72517390msgid "Unknown version: {0}"
    72527391msgstr "Версия неизвестна: {0}"
    72537392
    7254 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
     7393#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207
    72557394msgid "Found <nd> element in non-way."
    72567395msgstr "Найден элемент <nd> вне пути."
    72577396
    7258 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
     7397#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210
    72597398msgid "<nd> has zero ref"
    72607399msgstr "у <nd> нет ссылок ref"
    72617400
    7262 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:214
     7401#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:222
    72637402msgid "Found <member> element in non-relation."
    72647403msgstr "Найден тэг <member> вне отношения."
    72657404
    7266 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:219
     7405#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227
    72677406#, java-format
    72687407msgid "Missing attribute \"ref\" on member in relation {0}"
    72697408msgstr ""
    72707409
    7271 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
     7410#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
    72727411#, java-format
    72737412msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
    72747413msgstr ""
    72757414
    7276 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
     7415#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
    72777416#, java-format
    72787417msgid "Missing attribute \"type\" on member {0} in relation {1}"
    72797418msgstr ""
    72807419
    7281 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
     7420#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:237
    72827421#, java-format
    72837422msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
    72847423msgstr ""
    72857424
    7286 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
     7425#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
    72877426msgid "Incomplete <member> specification with ref=0"
    72887427msgstr "Неполная спецификация <member> с ref=0"
    72897428
    7290 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
     7429#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
    72917430msgid "Illegal object with id=0"
    72927431msgstr "Недопустимый объект с id=0"
    72937432
    7294 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
     7433#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:315
    72957434#, java-format
    72967435msgid ""
    … …  
    72987437msgstr ""
    72997438
    7300 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314
     7439#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
    73017440#, java-format
    73027441msgid "Missing attribute \"version\" on OSM primitive with id {0}"
    73037442msgstr ""
    73047443
    7305 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:329
     7444#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:336
    73067445#, java-format
    73077446msgid "Missing required attribute \"{0}\"."
    73087447msgstr "Отсутствует необходимый атрибут \"{0}\"."
    73097448
    7310 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356
     7449#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
    73117450#, java-format
    73127451msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
    … …  
    73157454"{0}\n"
    73167455
    7317 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:485
     7456#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:495
    73187457msgid "Prepare OSM data..."
    73197458msgstr "Подготовка данных..."
    73207459
    7321 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
     7460#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507
    73227461msgid "Ill-formed node id"
    73237462msgstr "Неверный номер точки"
    … …  
    73487487"соединение."
    73497488
    7350 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:103
     7489#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96
    73517490#, java-format
    73527491msgid ""
    … …  
    73557494msgstr ""
    73567495
    7357 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:134
     7496#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129
    73587497#, java-format
    73597498msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
    … …  
    76057744msgstr "Ошибка чтения файла с описанием модуля: {0}"
    76067745
    7607 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:300
     7746#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299
    76087747msgid "This is after the end of the recording"
    76097748msgstr "Это позже конца записи"
    76107749
    7611 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
     7750#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339
    76127751msgid "Error playing sound"
    76137752msgstr "Ошибка при воспроизведении звука"
    … …  
    86098748msgstr ""
    86108749
     8750#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33
     8751msgid "TangoGPS Files (*.log)"
     8752msgstr ""
     8753
     8754#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
     8755#, fuzzy
     8756msgid "Format errors: "
     8757msgstr "Ошибка формата файла"
     8758
     8759#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
     8760#, fuzzy
     8761msgid "TangoGPS import success"
     8762msgstr "Импорт NMEA успешно завершён"
     8763
     8764#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
     8765#, fuzzy
     8766msgid "TangoGPS import faliure!"
     8767msgstr "Сбой при импорте NMEA!"
     8768
    86118769#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
    86128770#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:21
    … …  
    93439501msgstr "Отображает проблемы из OpenStreetBugs"
    93449502
     9503#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97
     9504msgid ""
     9505"<html>The openstreetbus plugin is using the old server at appspot.com.<br>A "
     9506"new server is available at schokokeks.org.<br>Do you want to switch to the "
     9507"new server? (Strongly recommended)</html>"
     9508msgstr ""
     9509
     9510#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100
     9511msgid "Switch to new openstreetbugs server?"
     9512msgstr ""
     9513
    93459514#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
    93469515msgid ""
    … …  
    94479616msgstr "Неизвестное расширение файла: {0}"
    94489617
    9449 #: ../plugins/osmarender/src/OsmarenderPlugin.java:41
     9618#: ../plugins/osmarender/src/OsmarenderPlugin.java:39
    94509619msgid "Osmarender"
    94519620msgstr "Osmarender"
    94529621
    9453 #: ../plugins/osmarender/src/OsmarenderPlugin.java:96
     9622#: ../plugins/osmarender/src/OsmarenderPlugin.java:94
    94549623msgid ""
    94559624"Firefox not found. Please set firefox executable in the Map Settings page of "
    … …  
    94599628"Настройки карты в окне настроек."
    94609629
    9461 #: ../plugins/osmarender/src/OsmarenderPlugin.java:127
     9630#: ../plugins/osmarender/src/OsmarenderPlugin.java:125
    94629631msgid "osmarender options"
    94639632msgstr "Настройки osm рендера"
    94649633
    9465 #: ../plugins/osmarender/src/OsmarenderPlugin.java:128
     9634#: ../plugins/osmarender/src/OsmarenderPlugin.java:126
    94669635msgid "Firefox executable"
    94679636msgstr "исполняемый файл Firefox"
    … …  
    96119780msgstr "Введите значение толщины"
    96129781
    9613 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
     9782#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69
    96149783msgid "Slippy Map"
    96159784msgstr "Интерактивная карта"
    96169785
    9617 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
     9786#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75
    96189787msgid "Load Tile"
    96199788msgstr "Загрузить фрагмент"
    96209789
    9621 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
     9790#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86
    96229791msgid "Show Tile Status"
    96239792msgstr "Показать статус фрагмента"
    96249793
    9625 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
     9794#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97
    96269795msgid "Request Update"
    96279796msgstr "Запросить обновление"
    96289797
    9629 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
     9798#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108
    96309799msgid "Load All Tiles"
    96319800msgstr "Загрузить все фрагменты"
    96329801
    9633 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
     9802#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118
    96349803msgid "Increase zoom"
    96359804msgstr "Приблизить"
    96369805
    9637 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
     9806#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127
    96389807msgid "Decrease zoom"
    96399808msgstr "Отодвинуть"
    96409809
    9641 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
     9810#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
     9811msgid "Flush Tile Cache"
     9812msgstr ""
     9813
     9814#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442
    96429815msgid "image not loaded"
    96439816msgstr "изображение не загружено"
     9817
     9818#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
     9819#, fuzzy
     9820msgid "image loading..."
     9821msgstr "Закачка..."
    96449822
    96459823#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
    … …  
    96809858msgstr "Бледный фон: "
    96819859
    9682 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
     9860#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123
    96839861msgid "error loading metadata"
    96849862msgstr "ошибка загрузки метаданных"
    96859863
    9686 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
     9864#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138
    96879865#, java-format
    96889866msgid "requested: {0}"
    96899867msgstr "предлагается: {0}"
    96909868
    9691 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
     9869#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142
    96929870msgid "error requesting update"
    96939871msgstr "ошибка при запросе обновления"
    … …  
    986010038msgstr "Обратный ряд домов вдоль улицы"
    986110039
    9862 #: ../plugins/terracer/src/terracer/TerracerAction.java:78
    9863 #: ../plugins/terracer/src/terracer/TerracerAction.java:82
     10040#: ../plugins/terracer/src/terracer/TerracerAction.java:68
     10041#: ../plugins/terracer/src/terracer/TerracerAction.java:72
    986410042msgid "Terrace a building"
    986510043msgstr "Ряд домов вдоль улицы"
    986610044
    9867 #: ../plugins/terracer/src/terracer/TerracerAction.java:80
     10045#: ../plugins/terracer/src/terracer/TerracerAction.java:70
    986810046msgid "Creates individual buildings from a long building."
    986910047msgstr "Создать отдельные здания  из длинного здания"
    987010048
    9871 #: ../plugins/terracer/src/terracer/TerracerAction.java:140
     10049#: ../plugins/terracer/src/terracer/TerracerAction.java:130
    987210050msgid "Select a single, closed way of at least four nodes."
    987310051msgstr "Выберите одину, замкнутую линию по крайней мере из четырех узлов."
    987410052
    9875 #: ../plugins/terracer/src/terracer/TerracerAction.java:209
     10053#: ../plugins/terracer/src/terracer/TerracerAction.java:199
    987610054msgid "Terrace"
    987710055msgstr "Ряд домов вдоль улицы"
    987810056
    9879 #: ../plugins/terracer/src/terracer/TerracerAction.java:423
    9880 #: ../plugins/terracer/src/terracer/TerracerAction.java:447
     10057#: ../plugins/terracer/src/terracer/TerracerAction.java:413
     10058#: ../plugins/terracer/src/terracer/TerracerAction.java:437
    988110059msgid "Even"
    988210060msgstr "Четные"
    988310061
    9884 #: ../plugins/terracer/src/terracer/TerracerAction.java:424
     10062#: ../plugins/terracer/src/terracer/TerracerAction.java:414
    988510063msgid "Odd"
    988610064msgstr "Нечетные"
    988710065
    9888 #: ../plugins/terracer/src/terracer/TerracerAction.java:482
     10066#: ../plugins/terracer/src/terracer/TerracerAction.java:472
    988910067msgid "Highest number"
    989010068msgstr "Максимальный номер"
    989110069
    9892 #: ../plugins/terracer/src/terracer/TerracerAction.java:483
     10070#: ../plugins/terracer/src/terracer/TerracerAction.java:473
    989310071msgid "Lowest number"
    989410072msgstr "Минимальный номер"
    989510073
    9896 #: ../plugins/terracer/src/terracer/TerracerAction.java:484
     10074#: ../plugins/terracer/src/terracer/TerracerAction.java:474
    989710075msgid "Interpolation"
    989810076msgstr "Интерполяция"
    989910077
    990010078#. item "Buildings/Addresses" text "House name"
    9901 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
     10079#: ../plugins/terracer/src/terracer/TerracerAction.java:475
    990210080#: build/trans_presets.java:2173
    990310081msgid "Street name"
    990410082msgstr "Название улицы"
    990510083
    9906 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
     10084#: ../plugins/terracer/src/terracer/TerracerAction.java:475
    990710085msgid "Optional"
    990810086msgstr "Необъязательно"
    … …  
    994510123msgstr "Извините, для анонимных пользователей это недоступно"
    994610124
    9947 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
     10125#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
    994810126msgid "Join overlapping Areas"
    994910127msgstr "Объединить накладывающиеся области"
    995010128
    9951 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
     10129#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
    995210130msgid "Joins areas that overlap each other"
    995310131msgstr "Объединить области, накладывающиеся друг на друга"
    995410132
    9955 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125
     10133#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
    995610134msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
    995710135msgstr ""
    … …  
    995910137"загрузкой."
    996010138
    9961 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
     10139#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
    996210140msgid "Continue anyway"
    996310141msgstr "Продолжить в любом случае"
    996410142
    9965 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:148
     10143#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:133
    996610144msgid "Only up to two areas can be joined at the moment."
    996710145msgstr "Только два района могут быть объединены в данный момент."
    996810146
    9969 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:153
     10147#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:138
    997010148#, java-format
    997110149msgid "\"{0}\" is not closed and therefore can't be joined."
    997210150msgstr "\"{0}\" не замкнут, и поэтому они не могут быть объединены."
    997310151
    9974 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:170
     10152#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:155
    997510153#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
    997610154msgid ""
    … …  
    998310161"Действительно продолжить?"
    998410162
    9985 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:173
     10163#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:158
    998610164#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67
    998710165msgid "Please abort if you are not sure"
    998810166msgstr "Пожалуйста, остановитесь, если вы не уверены"
    998910167
    9990 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:187
     10168#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:172
    999110169msgid "Please select at least one closed way the should be joined."
    999210170msgstr ""
    … …  
    999410172"быть объединены."
    999510173
    9996 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
     10174#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:180
    999710175msgid "No intersection found. Nothing was changed."
    999810176msgstr ""
    999910177
    10000 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
     10178#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:202
    1000110179msgid "Added node on all intersections"
    1000210180msgstr "Добавлены узлы на всех пересечениях"
    1000310181
    10004 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
     10182#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
    1000510183msgid "Delete Ways that are not part of an inner multipolygon"
    1000610184msgstr "Удалить линии, которые не являются частью внутреннего мультиполигона"
    1000710185
    10008 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
     10186#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
    1000910187msgid "Fix relations"
    1001010188msgstr "Исправить отношения"
    1001110189
    10012 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
     10190#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
    1001310191msgid "Joined self-overlapping area"
    1001410192msgstr "Присоединить самоперекрывающиеся области"
    1001510193
    10016 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
     10194#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237
    1001710195msgid "Joined overlapping areas"
    1001810196msgstr "Присоединить перекрывающиеся области"
    1001910197
    10020 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
     10198#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
    1002110199msgid ""
    1002210200"Some of the ways were part of relations that have been modified. Please "
    … …  
    1002610204"Пожалуйста, проверьте не появились ли ошибки."
    1002710205
    10028 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
     10206#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
    1002910207msgid "Fix tag conflicts"
    1003010208msgstr "Инсправить конфликт тегов"
    1003110209
    10032 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
     10210#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:464
    1003310211msgid "Removed Element from Relations"
    1003410212msgstr "Удалить Элементы из Отношений"
    1003510213
    10036 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
     10214#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:573
    1003710215msgid "Join Areas: Remove Short Ways"
    1003810216msgstr "Присоединить районы: удаление коротких путей"
    1003910217
    10040 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
     10218#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
    1004110219msgid "Closed Way"
    1004210220msgstr "Замкнутая линия"
    1004310221
    10044 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
     10222#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:856
    1004510223msgid "Remove tags from inner ways"
    1004610224msgstr "Удаление тегов у внутренних линий"
    1004710225
    10048 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
     10226#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:885
    1004910227msgid "Join Areas Function"
    1005010228msgstr "Присоединить районы функционирования"
    1005110229
    10052 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
     10230#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
    1005310231msgid "Jump To Position"
    1005410232msgstr "Перейти на позицию"
    1005510233
    10056 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
     10234#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
    1005710235msgid "Opens a dialog that allows to jump to a specific location"
    1005810236msgstr ""
    1005910237"Открывает диалоговое окно, которое позволяет перейти к определенной местности"
    1006010238
    10061 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:65
     10239#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
    1006210240msgid "Enter Lat/Lon to jump to position."
    1006310241msgstr "Введите Lat / Lon, чтобы перейти к позиции."
    1006410242
    10065 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:67
     10243#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
    1006610244msgid "You can also paste an URL from www.openstreetmap.org"
    1006710245msgstr "Вы также можете вставить URL из www.openstreetmap.org"
    1006810246
    10069 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:99
     10247#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
    1007010248msgid "Zoom (in metres)"
    1007110249msgstr "Приближение (в метрах)"
    1007210250
    10073 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
     10251#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
    1007410252msgid "URL"
    1007510253msgstr "URL"
    1007610254
    10077 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105
     10255#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
    1007810256msgid "Jump there"
    1007910257msgstr "Перейти туда"
    1008010258
    10081 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
     10259#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
    1008210260msgid "Jump to Position"
    1008310261msgstr "Перейти к позиции"
    1008410262
    10085 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124
     10263#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
    1008610264msgid "Could not parse Latitude, Longitude or Zoom. Please check."
    1008710265msgstr ""
    … …  
    1008910267"проверьте."
    1009010268
    10091 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124
     10269#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
    1009210270msgid "Unable to parse Lon/Lat"
    1009310271msgstr "Невозможно разобрать широту/долготу"
    … …  
    1116811346msgstr ""
    1116911347
     11348#. Plugin dataimport
     11349#: build/trans_plugins.java:13
     11350msgid "Allows to import various file formats into JOSM directly."
     11351msgstr ""
     11352
    1117011353#. Plugin DirectUpload
    11171 #: build/trans_plugins.java:13
     11354#: build/trans_plugins.java:15
    1117211355msgid ""
    1117311356"This plugin directly upload GPS Traces from current active layer in JOSM to "
    … …  
    1117811361
    1117911362#. Plugin Duplicate-Way
    11180 #: build/trans_plugins.java:15
     11363#: build/trans_plugins.java:17
    1118111364msgid "Duplicate Ways with an offset"
    1118211365msgstr "Дублирующиеся линии со смещением"
    1118311366
    1118411367#. Plugin editgpx
    11185 #: build/trans_plugins.java:17
     11368#: build/trans_plugins.java:19
    1118611369msgid ""
    1118711370"Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
    … …  
    1119011373
    1119111374#. Plugin globalsat
    11192 #: build/trans_plugins.java:19
     11375#: build/trans_plugins.java:21
    1119311376msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
    1119411377msgstr ""
    … …  
    1119711380
    1119811381#. Plugin grid
    11199 #: build/trans_plugins.java:21
     11382#: build/trans_plugins.java:23
    1120011383msgid "Provide a background layer that displays a map grid"
    1120111384msgstr "Предоставлен фоновый слой который отображает сетку на карте"
    1120211385
    1120311386#. Plugin ImageWayPoint
    11204 #: build/trans_plugins.java:23
     11387#: build/trans_plugins.java:25
    1120511388msgid ""
    1120611389"Another plugin to match images to the waypoints in a GPX file. A match is "
    … …  
    1121311396
    1121411397#. Plugin lakewalker
    11215 #: build/trans_plugins.java:25
     11398#: build/trans_plugins.java:27
    1121611399msgid "Helps vectorizing WMS images."
    1121711400msgstr "Помогает векторизовать изображения WMS."
    1121811401
    1121911402#. Plugin livegps
    11220 #: build/trans_plugins.java:27
     11403#: build/trans_plugins.java:29
    1122111404msgid ""
    1122211405"Support live GPS input (moving dot) through a connection to gpsd server."
    … …  
    1122511408
    1122611409#. Plugin measurement
    11227 #: build/trans_plugins.java:29
     11410#: build/trans_plugins.java:31
    1122811411msgid ""
    1122911412"Provide a measurement dialog and a layer to measure length and angle of "
    … …  
    1123611419
    1123711420#. Plugin nearclick
    11238 #: build/trans_plugins.java:31
     11421#: build/trans_plugins.java:33
    1123911422msgid ""
    1124011423"Simulates a click when you do a small and short drag. This is usefull for "
    … …  
    1124711430
    1124811431#. Plugin openlayers
    11249 #: build/trans_plugins.java:33
     11432#: build/trans_plugins.java:35
    1125011433msgid "Displays an OpenLayers background image"
    1125111434msgstr "Отобразить фоновый рисунок OpenLayers"
    1125211435
    1125311436#. Plugin openstreetbugs
    11254 #: build/trans_plugins.java:35
     11437#: build/trans_plugins.java:37
    1125511438msgid "Imports issues from OpenStreetBugs"
    1125611439msgstr "Импорт вопросов из OpenStreetBugs"
    1125711440
    1125811441#. Plugin openvisible
    11259 #: build/trans_plugins.java:37
     11442#: build/trans_plugins.java:39
    1126011443msgid ""
    1126111444"Allows opening gpx/osm files that intersect the currently visible screen area"
    … …  
    1126511448
    1126611449#. Plugin osmarender
    11267 #: build/trans_plugins.java:39
     11450#: build/trans_plugins.java:41
    1126811451msgid ""
    1126911452"Launches FireFox to display the current visible screen as a nice SVG image."
    … …  
    1127111454
    1127211455#. Plugin PicLayer
    11273 #: build/trans_plugins.java:41
     11456#: build/trans_plugins.java:43
    1127411457msgid ""
    1127511458"This plugin allows to display any picture as a background in the editor and "
    … …  
    1128011463
    1128111464#. Plugin plastic_laf
    11282 #: build/trans_plugins.java:43
     11465#: build/trans_plugins.java:45
    1128311466msgid "The great JGoodies Plastic Look and Feel."
    1128411467msgstr "Великолепный JGoodies Пластиковый Скин."
    1128511468
    1128611469#. Plugin remotecontrol
    11287 #: build/trans_plugins.java:45
     11470#: build/trans_plugins.java:47
    1128811471msgid "Let other applications send commands to JOSM."
    1128911472msgstr "Разрешить другим приложениям посылать команды JOSM."
    1129011473
    1129111474#. Plugin routing
    11292 #: build/trans_plugins.java:47
     11475#: build/trans_plugins.java:49
    1129311476msgid "Provides routing capabilities."
    1129411477msgstr "Предоставляет возможности маршрутизации."
    1129511478
    1129611479#. Plugin slippymap
    11297 #: build/trans_plugins.java:49
     11480#: build/trans_plugins.java:51
    1129811481msgid ""
    1129911482"Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
    … …  
    1130411487
    1130511488#. Plugin surveyor
    11306 #: build/trans_plugins.java:51
     11489#: build/trans_plugins.java:53
    1130711490msgid "Allow adding markers/nodes on current gps positions."
    1130811491msgstr "Разрешить добавить теги/узлы на текущей GPS позиции."
    1130911492
    1131011493#. Plugin tageditor
    11311 #: build/trans_plugins.java:53
     11494#: build/trans_plugins.java:55
    1131211495msgid "Provides a dialog for editing tags in a tabular grid."
    1131311496msgstr "Показывает окно для редактирования тегов в табличной сетке."
    1131411497
    1131511498#. Plugin tagging-preset-tester
    11316 #: build/trans_plugins.java:55
     11499#: build/trans_plugins.java:57
    1131711500msgid ""
    1131811501"Adds a tagging preset tester to the help menu, which helps you developing of "
    … …  
    1132611509
    1132711510#. Plugin tcx-support
    11328 #: build/trans_plugins.java:57
     11511#: build/trans_plugins.java:59
    1132911512msgid "Directly load TCX files from JOSM."
    1133011513msgstr "Прямо загрузить TCX файлы из JOSM."
    1133111514
    1133211515#. Plugin terracer
    11333 #: build/trans_plugins.java:59
     11516#: build/trans_plugins.java:61
    1133411517msgid "Make terraced houses out of single blocks."
    1133511518msgstr "Сделать ряд домов вдоль улицы из одного блока."
    1133611519
    1133711520#. Plugin usertools
    11338 #: build/trans_plugins.java:61
     11521#: build/trans_plugins.java:63
    1133911522msgid ""
    1134011523"Tools to work with authors/users. Selects map data that belongs to selected "
    … …  
    1134611529
    1134711530#. Plugin utilsplugin
    11348 #: build/trans_plugins.java:63
     11531#: build/trans_plugins.java:65
    1134911532msgid ""
    1135011533"Several utilities that make your life easier: e.g. simplify way, join areas, "
    … …  
    1135511538
    1135611539#. Plugin validator
    11357 #: build/trans_plugins.java:65
     11540#: build/trans_plugins.java:67
    1135811541msgid ""
    1135911542"An OSM data validator. It checks for problems in data, and provides fixes "
    … …  
    1136511548
    1136611549#. Plugin waydownloader
    11367 #: build/trans_plugins.java:67
     11550#: build/trans_plugins.java:69
    1136811551msgid "Easy downloading along a long set of interconnected ways"
    1136911552msgstr ""
    1137011553
    1137111554#. Plugin wmsplugin
    11372 #: build/trans_plugins.java:69
     11555#: build/trans_plugins.java:71
    1137311556msgid ""
    1137411557"Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
    … …  
    1637716560#: build/trans_presets.java:2891
    1637816561msgid "unitarian"
    16379 msgstr ""
     16562msgstr "унитарный"
    1638016563
    1638116564#: build/trans_presets.java:2161 build/trans_presets.java:2882
    … …  
    2253122714msgstr ""
    2253222715
     22716#~ msgid ""
     22717#~ "Please select at least one node, way or relation. Only already uploaded "
     22718#~ "elements have a history."
     22719#~ msgstr ""
     22720#~ "Пожалуйста выберите хотя бы один узел, путь или зависимость. Только у уже "
     22721#~ "загруженных элементов есть история."
     22722
     22723#~ msgid "Undeleting Way..."
     22724#~ msgstr "Восстановление удаленного пути..."
     22725
     22726#~ msgid "Checking whether node {0} is gone ..."
     22727#~ msgstr "Проверка существования узла {0} в прошлом..."
     22728
     22729#~ msgid "Undeleting relation..."
     22730#~ msgstr "Восстановление удаленного отношения..."
     22731
     22732#~ msgid "Checking whether primitive {0} is gone ..."
     22733#~ msgstr "Проверка существования примитива {0} в прошлом..."
     22734
     22735#~ msgid "Keep mine"
     22736#~ msgstr "Сохранить мои"
     22737
     22738#~ msgid "Delete mine"
     22739#~ msgstr "Удалить мои"
     22740
     22741#~ msgid ""
     22742#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
     22743#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
     22744#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
     22745#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
     22746#~ "accept the state on the server and to delete your primitive.<br>Click "
     22747#~ "<strong>{3}</strong> to cancel.<br>"
     22748#~ msgstr ""
     22749#~ "<html>OSM примитив с id <strong>{0}</strong> был удален<br>с сервера "
     22750#~ "другим картографом.<br><br>Нажмите <strong>{1}</strong> для сохранения "
     22751#~ "вашего примитива и игнорирования попытки удаления.<br> Ваш примитив будет "
     22752#~ "добавлен с новым id.<br>Нажмите <strong>{2}</strong> для согласия с "
     22753#~ "удалением примитива, (ваш примитив будет удален).<br>Нажмите <strong>{3}</"
     22754#~ "strong> для отмены.<br>"
     22755
     22756#~ msgid ""
     22757#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
     22758#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
     22759#~ "</html>"
     22760#~ msgstr ""
     22761#~ "<html>Выбрано  <strong>{0}</strong> примитивов <br>для индивидуального "
     22762#~ "обновления. Пожалуйста, уменьшите выделение <br>до макс. {1} примитивов.</"
     22763#~ "html>"
     22764
     22765#~ msgid "Selection too big"
     22766#~ msgstr "Выборка слишком большая"
     22767
     22768#~ msgid "Image with path {0} does not exist or is not readable."
     22769#~ msgstr "Картинка {0}  не существует или произошла ошибка чтения."
     22770
     22771#~ msgid "Uploading data"
     22772#~ msgstr "Загрузка данных"
     22773
     22774#~ msgid "Email"
     22775#~ msgstr "Электронная почта"
     22776
     22777#~ msgid "Resolve Conflicts"
     22778#~ msgstr "Разрешить конфликты"
     22779
     22780#~ msgid "{0} object has conflicts:"
     22781#~ msgid_plural "{0} objects have conflicts:"
     22782#~ msgstr[0] "{0} объект имеет конфликты."
     22783#~ msgstr[1] "{0} объекта имеет конфликты."
     22784#~ msgstr[2] "{0} объектов имеет конфликты."
     22785
     22786#~ msgid "my version:"
     22787#~ msgstr "моя версия:"
     22788
     22789#~ msgid "their version:"
     22790#~ msgstr "их версия:"
     22791
     22792#~ msgid "resolved version:"
     22793#~ msgstr "Разрешённая версия:"
     22794
     22795#~ msgid "Login name (email) to the OSM account."
     22796#~ msgstr "Имя пользователя (e-mail) учётной записи OSM"
     22797
     22798#~ msgid "OSM username (email)"
     22799#~ msgstr "Имя пользователя OSM (e-mail)"
     22800
     22801#~ msgid "Unknown host"
     22802#~ msgstr "Неизвестный хост"
     22803
     22804#~ msgid "position"
     22805#~ msgstr "положение"
     22806
     22807#~ msgid "different"
     22808#~ msgstr "различный"
     22809
     22810#~ msgid "true"
     22811#~ msgstr "истина"
     22812
     22813#~ msgid "false"
     22814#~ msgstr "ложь"
     22815
     22816#~ msgid "Resolve {0} conflicts in {1} objects"
     22817#~ msgstr "Разрешить {0} конфликтов в {1} объектах"
     22818
    2253322819#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
    2253422820#~ msgstr "Используйте мышь, или Ctrl+стрелки/./ для изменения масштаба."
    22535 
    22536 #~ msgid "Uploading data"
    22537 #~ msgstr "Загрузка данных"
    22538 
    22539 #~ msgid "Email"
    22540 #~ msgstr "Электронная почта"
    22541 
    22542 #~ msgid "Login name (email) to the OSM account."
    22543 #~ msgstr "Имя пользователя (e-mail) учётной записи OSM"
    22544 
    22545 #~ msgid "OSM username (email)"
    22546 #~ msgstr "Имя пользователя OSM (e-mail)"
    22547 
    22548 #~ msgid "Unknown host"
    22549 #~ msgstr "Неизвестный хост"
    2255022821
    2255122822#~ msgid "Add either site-josm.xml or Wiki Pages."
    … …  
    2271322984#~ msgstr "Пересечения найдено. Ничего не изменялось."
    2271422985
     22986#~ msgid "Solve Conflict"
     22987#~ msgstr "Разрешить конфликт"
     22988
    2271522989#~ msgid ""
    2271622990#~ "This action will require {0} individual download requests. Do you wish to "
    … …  
    2276223036#~ msgstr "Начать маршрутизацию"
    2276323037
    22764 #~ msgid "Not initialized"
    22765 #~ msgstr "Не инициализированно"
    22766 
    2276723038#~ msgid "Cannot read numeric value from response"
    2276823039#~ msgstr "Не возможно прочесть числовое знаечение из ответа"
Note: See TracChangeset for help on using the changeset viewer.