Index: applications/editors/josm/i18n/po/ru.po =================================================================== --- applications/editors/josm/i18n/po/ru.po (revision 16493) +++ applications/editors/josm/i18n/po/ru.po (revision 16827) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-12 23:40+0000\n" -"Last-Translator: pxx \n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-27 17:55+0000\n" +"Last-Translator: kruvalig \n" "Language-Team: Koptev Oleg \n" "MIME-Version: 1.0\n" @@ -17,83 +17,163 @@ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" "X-Poedit-Language: Russian\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Создание интерфейса" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Справка" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" -msgstr "Невозможно применить проекцию {0} . Используется Меркатор" - -#: ../core/src/org/openstreetmap/josm/Main.java:394 +msgstr "Невозможно активировать защиту {0}. Используется Меркатор" + +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "Ошибка" + +#: ../core/src/org/openstreetmap/josm/Main.java:399 msgid "Hint: Some changes came from uploading new data to the server." msgstr "Прим.: Некоторые изменения произошли из-за загрузки данных на сервер." -#: ../core/src/org/openstreetmap/josm/Main.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Несохранённые изменения" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Присутствуют несохранённые изменения. Сбросить изменения и продолжить?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Сохранить и выйти" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Отменить и выйти" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -102,32 +182,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Отмена" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Игнорируется неверная ссылка: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Предупреждение" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Игнорируется неверный адрес файла: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "НЕИЗВЕСТНО" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "О программе" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Отобразить информацию о программе." @@ -135,10 +275,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -146,5 +286,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -153,19 +293,19 @@ msgstr "Версия {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Последние изменения: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Версия Java: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Домашняя страница" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Отчёты об ошибках" @@ -175,37 +315,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Сведения" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Для прочтения" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Версия" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Авторы" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "Лицензия" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Модули" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "О программе" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Файл не найден" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -217,5 +361,5 @@ "''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -223,12 +367,5 @@ "связь." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Предупреждение" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -239,7 +376,35 @@ "примитивов" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Пожалуйста, выберите ряд для удаления." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Выберите один из вариантов:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Объединить точки" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Добавить точку..." @@ -251,14 +416,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -266,57 +433,57 @@ msgstr "Править: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Введите координаты новой точки" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Использовать десятичные градусы" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Отрицательные значения обозначают западное/южное полушарие" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Широта" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Долгота" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Выстроить точки окружностью" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Переместить выделенные точки так, чтобы они сформировали окружность." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -332,26 +499,59 @@ msgstr "Инструмент: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Выделите не менее четырёх точек." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "Информация" + #. Do it! -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Выстроить точки линией" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "" "Переместить выделенные точки на прямую, проходящую через две крайние точки." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Выделите не менее трёх точек." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -362,18 +562,10 @@ "- {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "Нарушение возможностей API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "Сбой инициализации API. Пожалуйста, попробуйте снова позднее." - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "Сбой инициализации API" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -384,5 +576,5 @@ "примитиве {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -393,46 +585,46 @@ "допустимую длину {2}. Значение длины {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "Нарушение предусловия" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "{0} точек в линии {1} превышают максимально допустимое число точек {2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "данные" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "слой" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "выделение" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "конфликт" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "скачанное" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Показать {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Изменить масштаб чтобы показать {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -442,30 +634,30 @@ msgstr "Вид: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Ничего не выделено для показа." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "Нет конфликтов чтобы их показать." +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Combine Way" msgstr "Объединить линию" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 msgid "Combine several ways into one." msgstr "Объединить несколько линий в одну." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Выделите не менее двух линий для объединения." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "Объединить линии, входящие в разные отношения?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -475,13 +667,13 @@ "объединить?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "Объединить в любом случае" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Изменить направления?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -490,10 +682,10 @@ "Линии с их текущими направлениями не объединить. Обратить некоторые линии?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Перевернуть и объеденить" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -501,20 +693,20 @@ msgstr "Введите значения для всех конфликтов." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Решение конфликтов" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Объединить {0} линии" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Все линии были пустыми" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -533,23 +725,24 @@ msgstr "Копировать выделенные объекты в буфер обмена." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Выделите что-нибудь для копирования." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Создать окружность" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Создать окружность по трём выделенным точкам" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Точки не расположены по кругу" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -557,87 +750,122 @@ msgstr "Выберите 2 или 3 узла или линию с двумя или тремя узлами." -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Удалить" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Удалить выделенные объекты." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Перезаписать" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "Файл уже существует. Перезаписать?" #. Do it! -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Распределить точки" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "Расположить точки на равных расстояниях вдоль линии." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 msgid "Download from OSM..." msgstr "Скачать с OSM..." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Скачать картографические данные с сервера OSM." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Файл: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Скачать" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Выберите хотя бы один тип данных для загрузки." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "За время импорта произошло {0} конфликт(ов)" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Ошибка в течение загрузки" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "({0}/{1}) Загрузка родителей примитива {2}" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Дублировать" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Создать копию выделения копированием и вставкой." @@ -657,5 +885,5 @@ msgstr "Выйти из программы" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -665,58 +893,73 @@ "лицензированных под GPL" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Экспорт в GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Экспортировать данные в GPX файл" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Нет данных для экспорта. Создайте данные." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "параметр ''{0}'' не должен быть нулевым" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "ожидался экземпляр OsmDataLayer или GpxLayer. Получен ''{0}''." + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "описание трека GPS" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Добавить информацию об авторе" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Настоящее имя" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "E-Mail" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Авторские права (ссылка)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Набор" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Авторские права (год)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Ключевые слова" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Опции экспорта" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Экспортировать и сохранить" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -727,25 +970,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Ошибка" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Выберите лицензию из набора" @@ -755,41 +978,44 @@ msgstr "Online-справка по JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Открыть в браузере" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Правка" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Обновить" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "Возможно только редактирование справочных страниц JOSM Online Help" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Ошибка при загрузке страницы {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." @@ -797,5 +1023,5 @@ "Страница справки отсутствует. Создайте её на английском." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -818,5 +1044,5 @@ #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18 msgid "Info about Element" -msgstr "Информация об Элементе" +msgstr "Информация об элементе" #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 @@ -833,30 +1059,40 @@ msgstr "Включить точку в состав ближайшей линии." -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Включить точку в линию" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Нет ярлыка" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Объединить в любом случае" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Объединить выделенный слой с нижележащим." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 msgid "Merge Nodes" msgstr "Объединить точки" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Merge nodes into the oldest one." msgstr "Объединить точки в одну (более старую)" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77 msgid "Please select at least two nodes to merge." msgstr "Пожалуйста, выберите как минимум две точки для объединения." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 msgid "Merge nodes with different memberships?" msgstr "Объединить точки из разных отношений?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -866,9 +1102,9 @@ "объединить?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" -msgstr "Очистить в любом случае" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +msgstr "Объединить в любом случае" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -876,60 +1112,71 @@ "используется." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Объединить {0} точек" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "выделение" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Обновить выбранные примитивы с сервера" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Зеркало" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "Зеркало выбранных узлов и путей." -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "Пожалуйста, выберите хотябы один узел или путь." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "вверх" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Переместить объекты {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "вниз" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "влево" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "вправо" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Переместить {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Перемещает объекты {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Невозможно переместить объекты за пределы мира." @@ -937,5 +1184,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Создать" @@ -945,26 +1192,17 @@ msgstr "Создать новую карту." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "безымянный" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Открыть..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Открыть файл." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Невозможно прочитать \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -993,10 +1231,10 @@ msgstr "Загрузить URL" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Сделать углы прямыми" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "" @@ -1004,13 +1242,13 @@ "градусов" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Возможно выбрать только две точки" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "Возможно выбирать только линии." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "" @@ -1018,5 +1256,5 @@ "точек." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" @@ -1024,9 +1262,10 @@ "функции." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Используется проекция EPSG:4326, что может привести
к нежелательным " @@ -1034,9 +1273,9 @@ "предупреждение больше не появлялось.
Всё равно продолжить?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Выбрана только одна точка" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Сделать углы прямыми" @@ -1052,11 +1291,11 @@ msgstr "Вставить содержимое буфера." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Вставить тэги" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Применить тэги из буфера ко всем выделенным объектам." @@ -1084,16 +1323,21 @@ msgstr "Вернуть последнее отменённое действие." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Переименовать слой" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Переименовать файл" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Невозможно переименовать файл \"{0}\"." @@ -1107,9 +1351,9 @@ msgstr "Изменить направление линии на противоположное." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Пожалуйста, выберите как минимум одну линию." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Изменить направление линии" @@ -1117,17 +1361,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Сохранить" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Сохранить текущие данные." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "Файл {0} существует. Перезаписать?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1137,25 +1383,25 @@ "создайте отчёт об ошибке." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Нет открытых документов. Нечего сохранять." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Пустой документ" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "В документе не содержиться данных" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Сохранить в любом случае" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Конфликты" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1165,54 +1411,77 @@ "будут обработаны, как будто вы отменили их все. Продолжить?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Отказаться от конфликтов и сохранить" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Сохранить файл OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Сохранить файл GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Сохранить слой" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Невозможно создать резервную копию." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Неизвестное расширение файла: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "" +"Произошла ошибка во время соединения с сервером
Подробности: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "При восстановлении из резервной копии возникла ошибка." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Неизвестное расширение файла." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "При сохранении возникла ошибка." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "При восстановлении из резервной копии возникла ошибка." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Сохранить как..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Сохранить текущие данные в новый файл." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Выбрать всё" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1247,16 +1516,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Закрыть" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Разделить линию" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Разделить линию в выбранной точке." @@ -1266,5 +1535,5 @@ msgstr "Текущее выделение невозможно разделить." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1273,5 +1542,5 @@ msgstr[2] "Выбранные точки не являются частью пути." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1292,9 +1561,9 @@ "выберите путь ещё." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "Выбранные точки не являются частью одной линии." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1303,10 +1572,10 @@ msgstr[2] "Выбранная линия не содержит выбранных точек" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "Чтобы разделить замкнутую линию, выберите две или более точки." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1316,21 +1585,23 @@ "линии)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 +#, fuzzy msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." msgstr "" "Участие в отношениях было применено ко всем новым линиям.\n" "Проверьте, и при необходимости внесите корректировки." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 +#, fuzzy msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." msgstr "" "Отношения членства были скопированы на все новые линии. \n" "Вы должны проверить и исправить, если это необходимо." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1351,52 +1622,52 @@ msgstr "Включает/выключает глобальную установку: «{0}»." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Разъединить линии" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "Дублировать точки, используемые несколькими линиями." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 msgid "This node is not glued to anything else." msgstr "Данная точка не связана с чем-либо еще." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 msgid "None of these nodes are glued to anything else." msgstr "Ни одна из этих точек не притянута к другим." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "None of this way's nodes are glued to anything else." msgstr "Ни одна из этих линий не притянута к другим." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "The current selection cannot be used for unglueing." msgstr "Выделенные объекты невозможно разъединить" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Выберите один из вариантов:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* Одна точка с тэгами, или" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* Одна точка, используемая несколькими линиями, либо" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" "* Одна точка, используемая несколькими линиями и одной из этих линий, либо" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "* Одна линия, имеющая точки, используемые несколькими линиями, либо" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1405,5 +1676,5 @@ "несколькими линиями." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1416,9 +1687,9 @@ "дубликаты точек, и все точки будут выбраны" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "Неприкрепленная точка" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1426,5 +1697,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1440,140 +1711,91 @@ msgstr "Отменить последнее действие." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Снять выделение" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Снять выделение со всех объектов." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Снять выделение со всего (Фокус)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Снять выделение со всего (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Обновить данные" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "Обновить слой данных с сервера (скачать данные заново)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"Не найдено данных для обновления. Вы уже открыли скачанный слой данных?" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "Нет данных" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "Ошибка обновления выбранного примитива." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "Ошибка обновления" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "Не найдено слоя данных GPX" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#, fuzzy +msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "Не могу найти примитив с ID {0} в текущем источнике данных" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "Прошущен примитив" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 msgid "Update Selection" msgstr "Обновить выборку" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "Обновить выбранные примитивы с сервера" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "Не выбраны примитивы для обновления." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Выборка пуста" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Загрузить на OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Загрузить все изменения на OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Новые объекты:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Изменённые объекты:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Удаляемые объекты:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Опишите изменения для закачиваемых данных:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132 -msgid "Upload these changes?" -msgstr "Загрузить эти изменения?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Загрузить изменения" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 msgid "Nothing to upload. Get some data first." msgstr "Нечего загружать. Сначала создайте данные." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "Присутствуют неразрешённые конфликты. Для начала, разрешите их" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Нет изменений для загрузки." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "Выгрузка" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "Обновление примитива" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "Синхронизированы только {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "Синхронизировать весь набор данных" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1595,17 +1817,17 @@ "редактирование.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "Обнаружен конфликт" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "неожиданное возвращённое значение. Получено {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1621,5 +1843,5 @@ "редактирования.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1628,57 +1850,60 @@ "\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format -msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" -"Ошибка выгрузки данных на сервер, так как ваши " -"данные
противоречат обязательным условиям.
Сообщение об ошибке:
" -"{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "Нарушение предварительного условия" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" -"Ошибкапри выгрузке данных, примитив который вы " -"пытаетесь удалить
уже удаленн с сервера.

Сообщение об ошибке:
" -"{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "Примитив уже удален" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 #, java-format msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" msgstr "Заголовок \"{0}\" не соответствуетожидаемой структуре \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 #, java-format msgid "Uploading failed.
{0}" msgstr "Не удалось загрузить данные.
{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 msgid "Upload to OSM API failed" msgstr "Ошибка выгрузки в OSM API" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "Обновление примитива" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Загрузить все изменения на OSM" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." -msgstr "" -"Ошибка создания подключения к серверу OSM {0}.\n" -"Проверьте в настройках URL сервера и наличие подключения к сети Internet." +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Новые объекты:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Изменённые объекты:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +msgid "Objects to delete:" +msgstr "Удаляемые объекты:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Опишите изменения для закачиваемых данных:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 +msgid "Upload these changes?" +msgstr "Загрузить эти изменения?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +msgid "Upload Changes" +msgstr "Загрузить изменения" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 +msgid "Uploading" +msgstr "Выгрузка" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1766,42 +1991,54 @@ msgstr "Играть медленнее." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "Скачивание данных GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "Скачанные GPX данные" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "Данные GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Загрузка данных" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "Данные не импортированы" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "Данные OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "Скачивание {0} из {1} ({2} осталось)" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Загрузка данных" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, fuzzy, java-format +msgid "The following errors occurred during mass download:{0}" msgstr "Следующие ошибки произошли во время массового скачивания:" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "Ошибка в течение загрузки" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1818,21 +2055,21 @@ "{2} что бы проигнорировать.
" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "Удалённые или перемещённые примитивы" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "Режим удаления" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Удалить точки или линии." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1840,5 +2077,5 @@ msgstr "Режим: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1849,774 +2086,23 @@ "точки." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "Рисовать" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Рисовать точки" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "Режим: Рисование фокуса" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "выбранные" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -msgid "Cannot add a node outside of the world." -msgstr "Точка не может быть добавлена за пределами мира." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493 -msgid "Add node" -msgstr "Добавить точку" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Вставить точку в линию" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "Присоединить линию к точке" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -msgid "Add a new node to an existing way" -msgstr "Добавить точку к линии" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504 -msgid "Add node into way and connect" -msgstr "Добавить точку к линии и объединить" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881 -msgid "Create new node." -msgstr "Создать новую точку" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "Выбирете точко под курсором" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "Вставить новый узел в линию" -msgstr[1] "Вставить новую точку в {0} линии" -msgstr[2] "Вставить новую точку в {0} линий" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -msgid "Start new way from last node." -msgstr "Начать путь с последней точки" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 -msgid "Continue way from last node." -msgstr "Продолжить путь с последней точки" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "Закончено вычерчивание" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "Выдавливание" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Создание областей" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "Выдавливание линии" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "Нарисуйте прямоугольник желаемых размеров, и отпустите кнопку мыши." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "Отпустите кнопку мыши, чтобы прекратить вращение." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "Перемещайте сегмент линии, чтобы образовать прямоугольник" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" -"Передвиньте значёк с играющей головой и отпустите возле трэка для " -"проигрывания звука в этом месте. SHIFT+release для синхронизации звука в " -"этой точке" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Выбор" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "Выбирать, двигать и вращать объекты" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "Добавьте или переместите новый виртуальный узел в линию" -msgstr[1] "Добавьте или переместите новый виртуальный узел в {0} линиях" -msgstr[2] "Добавьте или переместите новый виртуальный узел в {0} линиях" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "Переместить элементы" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" -"Перемещено больше чем {0} элементов. Перемещение такого количество элементов " -"часто является ошибкой. Действительно переместить?" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "Переместить" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "Отмена перемещения" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" -"Отпустите кнопку мыши, чтобы прекратить перемещение. Нажмите Ctrl для " -"объединения с ближайшей точкой." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" -"Переместите объект путём перетаскивания; Нажмите Shift для добавления к " -"выбранному (Ctrl для удаления); Shift-Ctrl для вращениы выбранного; или " -"измените выбранные элементы" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Масштаб" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Изменять масштаб и двигать карту" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" -"Меняйте масштаб колесом мыши, или клавишами Ctrl+. и Ctrl+,; перемещайте " -"карту, нажав правую кнопку мыши, или Ctrl+вверх/вниз/влево/вправо" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Поиск..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Поиск объектов." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "Никаких данных не загружено" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Пожалуйста, введите строку для поиска." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "заменить выделение" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "добавить к выделению" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "убрать из выделения" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "регистрозависимый" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "регулярное выражение" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "Baker Street - 'Baker' и 'Street' в любом ключе или названии." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "\"Baker Street\" - 'Baker Street' в любом ключе или названии." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -msgid "name:Bak - 'Bak' anywhere in the name." -msgstr "name:Bak - 'Bak' в любом месте названия." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "type=route - ключ 'type' с точным значением 'route'." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" -"type=* - ключ 'type' с любым значением. Также попробуйте *=value, type=, *=*, *=" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -msgid "-name:Bak - not 'Bak' in the name." -msgstr "-name:Bak - название не содержит 'Bak'." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 -msgid "foot: - key=foot set to any value." -msgstr "foot: - key=foot устанавливает в любых значениях." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 -msgid "Special targets:" -msgstr "Специальные цели:" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "type: - тип объекта (node, way, relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "user:... - all objects changed by user" -msgstr "user:... - все объекты, измененные заданным пользователем" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "id:... - object with given ID" -msgstr "id:... - объект с заданным ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "nodes:... - object with given number of nodes" -msgstr "nodes:... - объект с заданным количеством узлов" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "modified - all changed objects" -msgstr "modified - все измененные объекты" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "selected - все выбранные объекты" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "incomplete - все незаконченные объекты" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "без тэгов - все объекты без тэгов" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "Use | or OR to combine with logical or" -msgstr "" -"Используйте | либо OR чтобы объединить выражения логическим " -"«или»" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" -"Используйте \" чтобы заключить в кавычки операторы (например, если " -"ключ содержит двоеточие)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "Use ( and ) to group expressions" -msgstr "Используйте ( и ) для группировки выражений" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Поиск" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "Начать поиск" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "Не найдено совпадений для ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, java-format -msgid "Nothing added to selection by searching for ''{0}''" -msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 -#, java-format -msgid "Nothing removed from selection by searching for ''{0}''" -msgstr "Ничего не удалено из выделения в результате поиска ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 -#, java-format -msgid "Found {0} matches" -msgstr "Найдено {0} совпадений" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "CS" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "CI" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "RX" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" -"Ошибка в регулярном выражении \"{0}\" на позиции {1}, полный текст ошибки:\n" -"\n" -"{2}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" -"Ключ не может быть пустым при использовании тэга оператора. Пример " -"использования: ключ=значение" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" -"Неизвестный тип примитива: {0}. Разрешенные значения точка, линия или связь" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "Неожиданный знак: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "Отсутствуют параметры для \"ИЛИ\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "Отсутствуют параметры для \"НЕ\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "Отсутствует закрывающая скобка" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "Неверное число параметров для оператора точек." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" -"Неверное значение оператора точек: {0}. Оператор точек ожидает число. точек " -"или диапазон, например, 10-20" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "Неверное значение id оператора: {0}. Ожидалось число." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 -msgid "Load Selection" -msgstr "Загрузить выделенное" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:41 -#, java-format -msgid "Contact {0}..." -msgstr "Связаться с {0}..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Загрузка..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "Ошибка соединения с адресом: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "Ошибка разбора ссылки: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "Ошибка связи с сервером." - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "Добавить {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "Изменить {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "Удалить \"{0}\" для {1} ''{2}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "Установить {0}={1} для {2} ''{3}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "объект" -msgstr[1] "объекта" -msgstr[2] "объектов" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "Удалить \"{0}\" для {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "Установить {0}={1} для {2} {3}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "Невозможно отменить команду ''{0}'' так как отсутствует слой ''{1}''" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "Решите конфликт в координатах в {0}" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "не могу устранить нерешенный конфликт" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "Удалить {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "Удалить {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "Конфликтующее отношение" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"Выделенный объект \"{0}\" используется отношением \"{1}\" в роли \"{2}\".\n" -"Удалить из отношения?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "Удалить из связи" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" -"Выделенный объект \"{0}\" используется отношением \"{1}\".\n" -"Удалить из отношения?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359 -msgid "Split way segment" -msgstr "Разделить сегмент линии" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Вы собираетесь удалить точки, выходящие за скачанную зону.
Это может " -"вызвать проблемы, потому что другие объекты (которых не видно) могут " -"использовать их.
Вы действительно хотите удалить их?" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "Разрешить конфликт при удалении {0}" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Переместить" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "узел" -msgstr[1] "узла" -msgstr[2] "узлов" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "Очистка 1 примитива" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "удаление ссылки из линии {0}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" -"Внимание: Удаление линии {0}, так как количество точек стало меньше 2. " -"Текущее значение {1}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "удаление ссылки из связи {0}" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 -#, java-format -msgid "Resolve conflicts in member list of relation {0}" -msgstr "Устранить конфликты в списке участников отношения {0}" - -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "Повернуть {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -msgstr "Последовательность" - -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "Устранить конфликты тега {0} в {1}{2}" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 -#, java-format -msgid "Undelete {0} primitives" -msgstr "Отменить удаление {0} примитивов" - -#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40 -#, java-format -msgid "Resolve version conflicts for {0} {1}" -msgstr "Устранить конфликты версии для {0}{1}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "Устранить конфликты в списке точек линии {0}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "В основном наборе нет узла {0}" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Применить?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" -"При изменении направления линии, предлагается исправить следующие параметры " -"для поддержания целостности данных" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "Отношение" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "Старая роль" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "Новая роль" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "Старый ключ" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "Старое значение" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "Новый ключ" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "Новое значение" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "Применить выбранные изменения" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "Не применять изменения" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -msgid "Please select which property changes you want to apply." -msgstr "Пожалуйста, выберите, какие параметры нужно изменить." - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96 -msgid "Properties of " -msgstr "Параметры " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "Роли в отношениях, относящихся к" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "Автоматически исправлять тэги" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "Ошибка в файле конфигурации на строках {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Не удается прочитать каталог с настройками: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "Файл настроек поврежден. Восстанавливаем из старой копии в {0}." - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "Параметры сохранены на {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, java-format -msgid "Could not upload preferences. Reason: {0}" -msgstr "Невозможно загрузить параметры. Причина: {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93 -msgid "Could not load preferences from server." -msgstr "Невозможно скачать параметры с сервера." - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2628,8 +2114,816 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" msgstr "параметр ''{0}'' не должен быть null" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "Рисовать" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Рисовать точки" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Mode: Draw Focus" +msgstr "Режим: Рисование фокуса" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "выбранные" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +msgid "Cannot add a node outside of the world." +msgstr "Точка не может быть добавлена за пределами мира." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528 +msgid "Add node" +msgstr "Добавить точку" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Вставить точку в линию" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "Присоединить линию к точке" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +msgid "Add a new node to an existing way" +msgstr "Добавить точку к линии" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542 +msgid "Add node into way and connect" +msgstr "Добавить точку к линии и объединить" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928 +msgid "Create new node." +msgstr "Создать новую точку" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "Выбирете точко под курсором" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "Вставить новый узел в линию" +msgstr[1] "Вставить новую точку в {0} линии" +msgstr[2] "Вставить новую точку в {0} линий" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +msgid "Start new way from last node." +msgstr "Начать путь с последней точки" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947 +msgid "Continue way from last node." +msgstr "Продолжить путь с последней точки" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "Закончено вычерчивание" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "Выдавливание" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Создание областей" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "Выдавливание линии" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "Нарисуйте прямоугольник желаемых размеров, и отпустите кнопку мыши." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "Отпустите кнопку мыши, чтобы прекратить вращение." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "Перемещайте сегмент линии, чтобы образовать прямоугольник" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" +"Передвиньте значёк с играющей головой и отпустите возле трэка для " +"проигрывания звука в этом месте. SHIFT+release для синхронизации звука в " +"этой точке" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Выбор" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "Выбирать, двигать и вращать объекты" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "Добавьте или переместите новый виртуальный узел в линию" +msgstr[1] "Добавьте или переместите новый виртуальный узел в {0} линиях" +msgstr[2] "Добавьте или переместите новый виртуальный узел в {0} линиях" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "Переместить элементы" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" +"Перемещено больше чем {0} элементов. Перемещение такого количество элементов " +"часто является ошибкой. Действительно переместить?" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "Переместить" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "Отмена перемещения" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" +"Отпустите кнопку мыши, чтобы прекратить перемещение. Нажмите Ctrl для " +"объединения с ближайшей точкой." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" +"Переместите объект путём перетаскивания; Нажмите Shift для добавления к " +"выбранному (Ctrl для удаления); Shift-Ctrl для вращениы выбранного; или " +"измените выбранные элементы" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Масштаб" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Изменять масштаб и двигать карту" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" +"Меняйте масштаб колесом мыши, или клавишами Ctrl+. и Ctrl+,; перемещайте " +"карту, нажав правую кнопку мыши, или Ctrl+вверх/вниз/влево/вправо" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "Поиск..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Поиск объектов." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Пожалуйста, введите строку для поиска." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "заменить выделение" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "добавить к выделению" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "убрать из выделения" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "регистрозависимый" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "регулярное выражение" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "Baker Street - 'Baker' и 'Street' в любом ключе или названии." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "\"Baker Street\" - 'Baker Street' в любом ключе или названии." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 +msgid "name:Bak - 'Bak' anywhere in the name." +msgstr "name:Bak - 'Bak' в любом месте названия." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 +msgid "type=route - key 'type' with value exactly 'route'." +msgstr "type=route - ключ 'type' с точным значением 'route'." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +msgid "" +"type=* - key 'type' with any value. Try also *=value, " +"type=, *=*, *=" +msgstr "" +"type=* - ключ 'type' с любым значением. Также попробуйте *=value, type=, *=*, *=" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +msgid "-name:Bak - not 'Bak' in the name." +msgstr "-name:Bak - название не содержит 'Bak'." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +msgid "foot: - key=foot set to any value." +msgstr "foot: - key=foot устанавливает в любых значениях." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +msgid "Special targets:" +msgstr "Специальные цели:" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "type: - тип объекта (node, way, relation)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +msgid "user:... - all objects changed by user" +msgstr "user:... - все объекты, измененные заданным пользователем" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +msgid "id:... - object with given ID" +msgstr "id:... - объект с заданным ID" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +msgid "nodes:... - object with given number of nodes" +msgstr "nodes:... - объект с заданным количеством узлов" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +msgid "modified - all changed objects" +msgstr "modified - все измененные объекты" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "selected - все выбранные объекты" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "incomplete - все незаконченные объекты" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "без тэгов - все объекты без тэгов" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" +"child выражение - все наследники объектов, соответствующие " +"выражению" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +msgid "" +"parent expr - all parents of objects matching the expression" +msgstr "" +"parent выражение - все предки объектов, соответствующие " +"выражению" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +msgid "Use | or OR to combine with logical or" +msgstr "" +"Используйте | либо OR чтобы объединить выражения логическим " +"«или»" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" +"Используйте \" чтобы заключить в кавычки операторы (например, если " +"ключ содержит двоеточие)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +msgid "Use ( and ) to group expressions" +msgstr "Используйте ( и ) для группировки выражений" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Поиск" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "Начать поиск" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, java-format +msgid "No match found for ''{0}''" +msgstr "Не найдено совпадений для ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#, java-format +msgid "Nothing added to selection by searching for ''{0}''" +msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#, java-format +msgid "Nothing removed from selection by searching for ''{0}''" +msgstr "Ничего не удалено из выделения в результате поиска ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#, java-format +msgid "Found {0} matches" +msgstr "Найдено {0} совпадений" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "CS" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "CI" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "RX" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" +"Ошибка в регулярном выражении \"{0}\" на позиции {1}, полный текст ошибки:\n" +"\n" +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" +"Ключ не может быть пустым при использовании тэга оператора. Пример " +"использования: ключ=значение" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "Ошибка синтаксиса шаблона: Шаблон {0} в {1} недопустим!" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" +"Неизвестный тип примитива: {0}. Разрешенные значения точка, линия или связь" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "Неожиданный знак: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "Отсутствуют параметры для \"ИЛИ\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "Отсутствуют параметры для \"НЕ\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "Отсутствует закрывающая скобка" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "Неверное число параметров для оператора точек." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" +"Неверное значение оператора точек: {0}. Оператор точек ожидает число. точек " +"или диапазон, например, 10-20" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Неверное значение id оператора: {0}. Ожидалось число." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Загрузить выделенное" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "Связаться с {0}..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +msgid "Downloading..." +msgstr "Загрузка..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#, java-format +msgid "Could not read from URL: \"{0}\"" +msgstr "Ошибка соединения с адресом: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 +#, java-format +msgid "Parsing error in URL: \"{0}\"" +msgstr "Ошибка разбора ссылки: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 +msgid "Error while communicating with server." +msgstr "Ошибка связи с сервером." + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65 +#, java-format +msgid "Add {0} {1}" +msgstr "Добавить {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 +#, java-format +msgid "Change {0} {1}" +msgstr "Изменить {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 +#, java-format +msgid "Remove \"{0}\" for {1} ''{2}''" +msgstr "Удалить \"{0}\" для {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 +#, java-format +msgid "Set {0}={1} for {2} ''{3}''" +msgstr "Установить {0}={1} для {2} ''{3}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:124 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "объект" +msgstr[1] "объекта" +msgstr[2] "объектов" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "Удалить \"{0}\" для {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "Установить {0}={1} для {2} {3}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "Изменить роль участника отношений для {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Разрешить конфликт" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, fuzzy, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "уже существует конфликт для примитива ''{0}''" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, fuzzy, java-format +msgid "Add conflict for ''{0}''" +msgstr "Не найдено совпадений для ''{0}''" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "Невозможно отменить команду ''{0}'' так как отсутствует слой ''{1}''" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "Решите конфликт в координатах в {0}" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "не могу устранить нерешенный конфликт" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 +#, java-format +msgid "Delete {1} {0}" +msgstr "Удалить {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 +#, java-format +msgid "Delete {0} {1}" +msgstr "Удалить {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:173 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178 +msgid "Conflicting relation" +msgstr "Конфликтующее отношение" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:174 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" +"Delete from relation?" +msgstr "" +"Выделенный объект \"{0}\" используется отношением \"{1}\" в роли \"{2}\".\n" +"Удалить из отношения?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +msgid "Delete from relation" +msgstr "Удалить из связи" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".\n" +"Delete from relation?" +msgstr "" +"Выделенный объект \"{0}\" используется отношением \"{1}\".\n" +"Удалить из отношения?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402 +msgid "Split way segment" +msgstr "Разделить сегмент линии" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"Вы собираетесь удалить точки, выходящие за скачанную зону.
Это может " +"вызвать проблемы, потому что другие объекты (которых не видно) могут " +"использовать их.
Вы действительно хотите удалить их?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Удалить из связи" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "Разрешить конфликт при удалении {0}" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Переместить" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "узел" +msgstr[1] "узла" +msgstr[2] "узлов" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "Очистка 1 примитива" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "удаление ссылки из линии {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" +"Внимание: Удаление линии {0}, так как количество точек стало меньше 2. " +"Текущее значение {1}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "удаление ссылки из связи {0}" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#, java-format +msgid "Resolve conflicts in member list of relation {0}" +msgstr "Устранить конфликты в списке участников отношения {0}" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 +#, java-format +msgid "Remove relation member {0} {1}" +msgstr "Удалить участника отношений {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#, java-format +msgid "Rotate {0} {1}" +msgstr "Повернуть {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +msgstr "Последовательность" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "Устранить конфликты тега {0} в {1}{2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#, java-format +msgid "Undelete {0} primitives" +msgstr "Отменить удаление {0} примитивов" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "Устранить конфликты версии для {0}{1}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "Устранить конфликты в списке точек линии {0}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "В основном наборе нет узла {0}" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Применить?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" +"При изменении направления линии, предлагается исправить следующие параметры " +"для поддержания целостности данных" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "Отношение" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "Старая роль" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "Новая роль" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "Старый ключ" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "Старое значение" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "Новый ключ" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "Новое значение" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "Применить выбранные изменения" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "Не применять изменения" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +msgid "Please select which property changes you want to apply." +msgstr "Пожалуйста, выберите, какие параметры нужно изменить." + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +msgid "Properties of " +msgstr "Параметры " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "Роли в отношениях, относящихся к" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "Автоматически исправлять тэги" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, java-format +msgid "Malformed config file at lines {0}" +msgstr "Ошибка в файле конфигурации на строках {0}" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 +#, java-format +msgid "Cannot open preferences directory: {0}" +msgstr "Не удается прочитать каталог с настройками: {0}" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364 +#, java-format +msgid "Preferences file had errors. Making backup of old one to {0}." +msgstr "Файл настроек поврежден. Восстанавливаем из старой копии в {0}." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#, java-format +msgid "Preferences stored on {0}" +msgstr "Параметры сохранены на {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, java-format +msgid "Could not upload preferences. Reason: {0}" +msgstr "Невозможно загрузить параметры. Причина: {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +msgid "Could not load preferences from server." +msgstr "Невозможно скачать параметры с сервера." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" +msgstr "уже существует конфликт для примитива ''{0}''" #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 @@ -2657,5 +2951,5 @@ msgstr "В" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2664,27 +2958,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "неполный" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Ошибка: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Предупреждение: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "точки" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2693,13 +2987,13 @@ msgstr[2] "линий" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "линии" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2708,22 +3002,22 @@ msgstr[2] "отношений" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "отношения" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" msgstr "набор изменений" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" msgstr "наборы изменений" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "параметр ''{0}'' - имя недопустимого типа, получен ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2738,23 +3032,23 @@ msgstr[2] "{0} участников" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "дорога" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "железная дорога" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "водоёмы" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "землепользование" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2810,5 +3104,5 @@ msgstr "параметр {0} не в интервале 0..{1}, текущее значение {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "Путь, обозначающий границу области, не закрыт." @@ -2949,9 +3243,4 @@ "Сохраняю мой примитив. " -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr " [id: {0}]" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2968,5 +3257,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "фон" @@ -2977,8 +3266,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "ГСК WGS84" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "Географическая WGS84" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2994,5 +3283,5 @@ "и начните новый слой в новой зоне." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "Зоны Ламберта (Франция)" @@ -3015,22 +3304,138 @@ msgstr "UTM Зона {0}" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Невозможно прочитать закладки" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Невозможно записать закладки" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "Больше не показывать" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" +"Ошибка создания подключения к серверу OSM {0}.\n" +"Проверьте в настройках URL сервера и наличие подключения к сети Internet." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" +"Ошибка выгрузки данных на сервер, так как ваши " +"данные
противоречат обязательным условиям.
Сообщение об ошибке:
" +"{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "Нарушение предварительного условия" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "неизвестный" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Неожиданная ошибка" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" +"Не удается соединиться с сервером OSM. Пожалуйста, проверьте Ваше интернет-" +"соединение." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" +"Ошибка создания подключения к серверу OSM {0}.\n" +"Проверьте в настройках URL сервера и наличие подключения к сети Internet." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173 +msgid "Unknown host" +msgstr "Неизвестный хост" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" +"Ошибкапри выгрузке данных, примитив который вы " +"пытаетесь удалить
уже удаленн с сервера.

Сообщение об ошибке:
" +"{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "Примитив уже удален" + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "Сообщение дня недоступно" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "- сейчас запущена версия {0}" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "Загружается \"Сообщение дня\"" @@ -3111,62 +3516,57 @@ msgstr "Пароль" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "Не могу найти перевод {0}. Возвращено {1}." - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "использование" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "опции" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Показать эту справку" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "Стандартный параметр геометрии unix" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "Скачать область в пределах рамки" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Скачать область по ссылке (с параметрами lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "Открыть файл (как данные GPS, если .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "Скачать область в пределах рамки, как данные GPS" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "Выбор с учетом поиска" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "Запуск в развернутом виде" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Восстановить параметры по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "Установить язык." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "примеры" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3176,25 +3576,25 @@ "убедитесь, что загружаете данные перед --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "Вместо --download= можно указать osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Включение обновлённых модулей" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Загрузка ранних модулей" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Настройки по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Загрузка модулей" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -3203,26 +3603,26 @@ "используется." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Файл" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Вид" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Инструменты" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Шаблоны" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3230,21 +3630,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Каркас" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Показать/скрыть каркас" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Полноэкранный режим" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "Переключить в Полноэкранный режим" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Аудио" @@ -3288,53 +3688,68 @@ msgstr "масштаб" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "Географическая долгота положения курсора" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "Название объекта, на который наведён курсор" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "Географическая широта положения курсора" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "Угол между предыдущим и текущим сегментом линии" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "Путевой угол создаваемого сегмента" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "Длина создаваемого сегмента линии" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(нет объекта)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "слоя нет в списке." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "Слой{0} должен быть в списке слоев" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Соединение с OSM сервером..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "Слой ''{0}'' должен быть в списке слоёв" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Ошибка разбора" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 msgid "File not found" msgstr "Файл не найден" + +#: ../core/src/org/openstreetmap/josm/gui/PrimitiveNameFormatter.java:13 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 +#, java-format +msgid " [id: {0}]" +msgstr " [id: {0}]" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -3356,4 +3771,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Инициализация" @@ -3385,20 +3801,20 @@ msgstr "роль {0} не участвует в паре сравнения {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "Параметры" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Тэги" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3406,30 +3822,30 @@ msgstr "Точки" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Участники" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "Нет неразрешённых конфликтов тегов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "Тэги({0} конфликтов)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} неразрешённых конфликтов тегов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "Точки(решённые)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -3438,17 +3854,17 @@ "узлов этого пути" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "Узлы(с конфликтами)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "Неустранённые конфликты в списке узлов этого пути" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "Члены(разрешённые)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3458,25 +3874,25 @@ "конфликтов в списке участников этого отношения" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "Участники отношений(с конфликтами)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "Неразрешённые конфликты в списке участников этого отношения" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgstr "Нет актуальных конфликтов свойств" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "Свойства (с конфликтами)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +msgstr "Конфликты свойств ожидающие устранения" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "Разрешение конфликтов" @@ -3507,5 +3923,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 msgid "lock scrolling" -msgstr "" +msgstr "блокировать прокрутку" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 @@ -3514,5 +3930,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "Моя версия" @@ -3523,5 +3939,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3533,7 +3949,9 @@ "decisions are applied." msgstr "" +"Список объединённых элементов. Они заменят Мои элементы когда решение об " +"объединении будет принято." #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "Их версия" @@ -3541,5 +3959,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 msgid "List of elements in their dataset, i.e. the server dataset" -msgstr "" +msgstr "Список элементов в их наборе данных, набор данных на сервере" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 @@ -3572,4 +3990,6 @@ "merged elements" msgstr "" +"Скопировать мои выделенные элементы после первого выделенного элемента в " +"объединённом списке элементов" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529 @@ -3581,4 +4001,5 @@ msgid "Copy their selected elements to the end of the list of merged elements" msgstr "" +"Скопировать их выделенные элементы в конец объединённого списка элементов" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 @@ -3587,4 +4008,6 @@ "of merged elements" msgstr "" +"Скопировать их выделенные элементы перед первым выделенным элементом в " +"объединённом списке элементов" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 @@ -3593,4 +4016,6 @@ "merged elements" msgstr "" +"Скопировать их выделенные элементы после первого выделенного элемента в " +"объединённом списке элементов" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 @@ -3611,7 +4036,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3620,5 +4044,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 msgid "Remove the selected entries from the list of merged elements" -msgstr "" +msgstr "Удалить выделенные записи из объединённого списка элементов" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 @@ -3630,13 +4054,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765 msgid "Freeze the current list of merged elements" -msgstr "" +msgstr "Зафиксировать текущий объединённый список элементов" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 msgid "Unfreeze" -msgstr "" +msgstr "Отменить фиксирование" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761 msgid "Unfreeze the list of merged elements and start merging" msgstr "" +"Отменить фиксирование объединённого списка элементов и начать объединение" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788 @@ -3645,4 +4070,6 @@ "Click {0} to start merging my and their entries" msgstr "" +"Нажмите {0} что бы начать объединение моих и их " +"записи" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 @@ -3652,4 +4079,6 @@ "html>" msgstr "" +"Нажмите {0} что бы закончить объединение моих и их " +"записей" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 @@ -3657,6 +4086,7 @@ msgid "My version ({0} entry)" msgid_plural "My version ({0} entries)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Моя версия ({0} запись)" +msgstr[1] "Моя версия ({0} записи)" +msgstr[2] "Моя версия ({0} записей)" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 @@ -3664,6 +4094,7 @@ msgid "Merged version ({0} entry)" msgid_plural "Merged version ({0} entries)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Объединённая версия ({0} запись)" +msgstr[1] "Объединённая версия ({0} записи)" +msgstr[2] "Объединённая версия ({0} записей)" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 @@ -3671,6 +4102,7 @@ msgid "Their version ({0} entry)" msgid_plural "Their version ({0} entries)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Их версия ({0} запись)" +msgstr[1] "Их версия ({0} записей)" +msgstr[2] "Их версия ({0} записей)" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 @@ -3685,14 +4117,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "параметр '{0}' не должен быть null" @@ -3721,10 +4153,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3735,19 +4167,19 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "Связь с сервером прервана" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "Да, восстановить их тоже" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "Нет, отменить действие" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3759,9 +4191,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "Восстановить дополнительные узлы?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3774,13 +4206,13 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "Восстановить связанные примитивы?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgstr "Свойства в моём наборе данных, то есть локальном наборе данных" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3788,90 +4220,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +msgstr "Свойства в их наборе данных, то есть серверном наборе данных" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "Координаты:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgstr "Удалён:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +msgstr "Видим:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(отсутствует)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "удалён" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +msgstr "не удалён" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +msgstr "видим (на сервере)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +msgstr "невидим (на сервере)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "Оставить клон локальной версии" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +msgstr "Физически удалить из локального набора данных" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +msgstr "Оставить мои координаты" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +msgstr "Оставить их координаты" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +msgstr "Восстановить конфликт между различными координатами" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +msgstr "Оставить моё состояние \"Удалён\"" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "Оставить их состояние \"Удалён\"" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +msgstr "Восстановить конфликт между состояниями \"Удалён\"" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +msgstr "Оставить моё состояние \"Видим\"" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "Да, сбросить id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "Нет, прервать" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3880,6 +4312,9 @@ "agree?" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +"Что бы оставить вашу локальную версию, JOSM
должен сбросить " +"значение id {0} {1} в 0.
Во время следующей загрузки на сервер, сервер " +"присвоит
новое значение id.
Вы согласны?" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "Сбросить в 0" @@ -3887,9 +4322,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608 msgid "Keep their visible state" -msgstr "" +msgstr "Оставить их состояние \"Видим\"" #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623 msgid "Yes, purge it" -msgstr "" +msgstr "Да, очистить" #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628 @@ -3899,4 +4334,6 @@ "dataset.
Do you agree?" msgstr "" +"JOSM будет должен удалить ваш локальный примитив с id {0}
из набора " +"данных.
Вы согласны?" #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633 @@ -3904,12 +4341,11 @@ msgstr "Удалить из набора данных" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" -msgstr "" - -#. setting up the member table +msgstr "Восстановить конфликт между состояниями \"Видим\"" + #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3944,5 +4380,5 @@ #, java-format msgid "The merged dataset will not include a tag with key {0}" -msgstr "" +msgstr "Объединённый набор данных не будет содержать тег с ключом {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 @@ -3950,14 +4386,14 @@ #, java-format msgid "My dataset does not include a tag with key {0}" -msgstr "" +msgstr "Мой набор данных не содержит тег с ключом {0}" #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3966,10 +4402,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3978,7 +4414,7 @@ msgstr "Значение" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" -msgstr "" +msgstr "Не могу принять неопределённое объединение тегов" #. should not happen, but just in case @@ -3986,13 +4422,13 @@ #, java-format msgid "Parameter 'col' must be 0 or 1. Got {0}" -msgstr "" +msgstr "Параметр 'col' должен быть 0 или 1. Текущее значение {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 msgid "My version (local dataset)" -msgstr "" +msgstr "Моя версия (локальный набор данных)" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 msgid "Their version (server dataset)" -msgstr "" +msgstr "Их версия (серверный набор данных)" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 @@ -4003,17 +4439,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 msgid "Keep the selected key/value pairs from the local dataset" -msgstr "" +msgstr "Оставить выделенные пары ключ/значение из локального набора данных" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 msgid "Keep the selected key/value pairs from the server dataset" -msgstr "" +msgstr "Оставить выделенных пары ключ/значение из серверного набора данных" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 msgid "Undecide" -msgstr "" +msgstr "Восстановить конфликт" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" -msgstr "" +msgstr "Пометить выделенные теги как нерешённые" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 @@ -4021,5 +4457,5 @@ #, java-format msgid "Their dataset does not include a tag with key {0}" -msgstr "" +msgstr "Их набор данных не содержит тег с ключом {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4036,9 +4472,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -4046,5 +4482,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -4074,42 +4510,63 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "Выбрать на карте объекты, выбранные в списке вверху." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "Отменить устранение конфликтов и закрыть диалог" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +msgid "Apply resolved conflicts and close the dialog" +msgstr "Применить устранение конфликтов и закрыть диалог" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +msgid "Apply Resolution" +msgstr "Применить решение" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Продолжить в любом случае" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Continue resolving" +msgstr "Продолжить решение" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#, fuzzy, java-format +msgid "" +"You didn''t finish to merge the differences in this conflict." +"
Conflict resolutions won't be applied unless all differences
are " +"resolved.Click {0} to close anyway." +"Already
resolved differences won't be applied.
Click " +"{1} to return to resolving conflicts." +msgstr "" +"Вы не закончили устранение конфликтов.
Нажмите {0} " +"что бы в любом случае применить уже устранённые конфликты.
Вы можете " +"устранить оставшиеся конфликты позже.
Нажмите {1} что бы " +"вернуться к устранению конфликтов." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210 +msgid "Conflict not resolved completely" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246 msgid "Resolve conflicts" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +msgstr "Устранить конфликт" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Устранить конфликты версии для {0}{1}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -4126,122 +4583,164 @@ msgid "Failed to load history from the server. Details:
{0}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +"Загрузка истории с сервера потерпела неудачу. Подробности:
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +msgstr "Индекс вне допустимых пределов. Текущее значение {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "Пункт истории" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "Загрузить историю" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "Загрузка истории для {0} с id {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "Перегрузить все выбранные объекты, и обновить список." #. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "Показать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +msgstr "Показать историю выделенного примитива" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Слои" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +msgid "Open a list of all loaded layers." +msgstr "Показать список всех загруженных слоёв." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272 msgid "Delete the selected layer." msgstr "Удалить выбранный слой." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Присутствуют несохранённые изменения. Всё равно удалить слой?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Удалить слой" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Вы действительно хотите удалить весь слой?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Информация" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "да" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "С" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Удалить" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Удалить {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Показать/скрыть" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Показать/скрыть выбранный слой" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Показать/скрыть текст/значки" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "Показать/скрыть текст и значки маркеров." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Слои" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -msgid "Open a list of all loaded layers." -msgstr "Показать список всех загруженных слоёв." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "частный" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Удалить выбранный слой." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Объединить выделенный слой с нижележащим." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 msgid "Move the selected layer one row up." msgstr "Переместить выделенный слой вверх." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Переместить выделенный слой вниз." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Объединить выделенный слой с нижележащим." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Слои: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Информационный стенд" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Это изменит до {0} объекта." +msgstr[0] "Количество изменяемых объектов: {0}" msgstr[1] "Это изменит до {0} объектов." msgstr[2] "Это изменит до {0} объектов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Пустое значение удаляет ключ." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "<различные>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Изменить значения?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4251,84 +4750,89 @@ msgstr[2] "Изменить параметры {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Пожалуйста, выберите ключ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Выберите значение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "Выберите объекты, для которых вы желаете изменить параметры." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Параметры/отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Параметры выделенных объектов." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Член группы" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Изменить отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Удалить выделение из отношения {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Добавить параметры" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Добавить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Добавить новую пару ключ/значение для всех объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Изменить параметры" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Изменить значение выбранного ключа для всех объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Удалить параметры" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Удалить выбранный ключ из всех объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Свойств: {0} / Входит в отношения: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Параметры / отношения" @@ -4337,63 +4841,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Показать список всех отношений." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Отношений: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +msgid "Open an editor for the selected relation" +msgstr "Открыть редактор для выбранного отношения" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 +msgid "Delete the selected relation" +msgstr "Удалить выбранное отношение" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Создать новое отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Отношений: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -msgid "Open an editor for the selected relation" -msgstr "Открыть редактор для выбранного отношения" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 -msgid "Delete the selected relation" -msgstr "Удалить выбранное отношение" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Текущее выделение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Показать окно со списком выбранных объектов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Масштаб по выбранным объектам" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Обновить список выбранного." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Масштаб по выделению" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Отн.:{0} / Путей:{1} / Точек:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "выделение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4403,5 +4909,5 @@ msgstr[2] "{0} линий" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4411,5 +4917,5 @@ msgstr[2] "{0} отношений" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4420,5 +4926,10 @@ msgstr "Отсоединить панель" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4427,143 +4938,420 @@ "панели." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Щёлкните для уменьшения/увеличения содержимого панели" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Авторы" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "Показать список людей, работающих с выделенными объектами." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Автор" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "кол-во объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Авторы: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Область для скачивания" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Удалить выбранное отношение" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Скачать видимые квадраты" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "Конфликт в данных" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Редактор зависимостей: удалить выбранные" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Загрузка Плагина {0}..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "Теги и члены" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "Отношения" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "Роль:" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Удалить Элементы из Отношений" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

Do you really want to add another relation member?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +msgid "Multiple members referring to same primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711 +#, java-format +msgid "" +"You are trying to add a relation to itself.

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" +"Добавить все примитивы, выделенные в текущем наборе данных, перед первым " +"членом" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" +"Добавить все примитивы, выделенные в текущем наборе данных, после последнего " +"члена" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" +"Добавить все примитивы, выделенные в текущем наборе данных, перед первым " +"выделенным членом" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" +"Добавить все примитивы, выделенные в текущем наборе данных, после последнего " +"выделенного члена" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +#, fuzzy +msgid "Remove all members referring to one of the selected primitives" +msgstr "Ошибка обновления выбранного примитива." + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "Редактор зависимостей: удалить выбранные" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "Редактор зависимостей: сортировать" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "Переместить выбранных членов отношения вверх" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "Редактор зависимостей: поднять" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "Переместить выбранных членов отношения вниз" + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "Редактор зависимостей: опустить" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Удалить все выделенные объекты из связей" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "Редактор зависимостей: удалить" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Удалить выбранное отношение" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "Продолжить решение" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Конфликт в данных" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Сохранить текущие данные." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "Применить" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "Применить обновления и закрыть диалог" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "Отменить обновления и закрыть диалог" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "Добавить пустой тег" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "Удалить выделенные теги" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "Скачать недостающие части линий и узлов, участвующих в отношении" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "Скачать участников" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "Редактор зависимостей: скачать членов" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "Задать роль для выбранных членов" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "Применить роль" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +#, fuzzy +msgid "Yes, apply it" +msgstr "Да, очистить" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "Подтверждение действия дистанционного управления" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "Создать копию этих отношений и открыть их в другом окне" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Уменьшить масштаб" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Переместить выбранных членов отношения вниз" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "Ссылается на" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "Изменить выбранное отношение" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Применить изменения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Основной" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Объект" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "присоединенный" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Переместить вверх" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Переместить выбранных членов отношения вверх" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Добавить выбранное" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Сделать все выбранные объекты участниками отношения" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Удалить выбранные" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Удалить все выделенные объекты из связей" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Переместить вниз" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Переместить выбранных членов отношения вниз" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Удалить текущего участника из отношения" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Скачать участников" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -msgid "Download all incomplete ways and nodes in relation" -msgstr "Скачать недостающие части линий и узлов, участвующих в отношении" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Редактор отношений: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +msgstr "Изменить новое отношение в слое ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +msgstr "Изменить новое отношение в слое ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "Изменить отношение #{0} в слое ''{1}''" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Загрузить выделенное" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4573,5 +5361,5 @@ msgstr "<множественный>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4582,26 +5370,22 @@ msgstr[2] "Удалить старые ключи из {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "Обновление свойств {0} объекта" -msgstr[1] "Обновление свойств {0} объектов" -msgstr[2] "Обновление свойств {0} объектов" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Закладки" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Пожалуйста, введите сначала желаемые координаты" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Пожалуйста, введите название места." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "Изменить расположение" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Сначала выберите закладку." @@ -4636,17 +5420,17 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Источники и типы данных" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Скачать как новый слой" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Область для скачивания" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "" @@ -4654,18 +5438,18 @@ "запрос." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "Область для скачивания приемлема по площади." #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "Нулевой исключение, возможно есть отсутствующие тэги" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Задайте строку для поиска" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Не удается получить результаты поиска" @@ -4673,5 +5457,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Название места для поиска:" @@ -4679,5 +5463,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4685,6 +5469,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "название" @@ -4723,6 +5507,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4745,15 +5529,15 @@ msgstr "тип" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "возле" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "масштаб" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4762,5 +5546,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "Интерактивная карта" @@ -4792,5 +5576,11 @@ msgstr "История для {0}{1}" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "Закрыть диалог" @@ -5532,5 +6322,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5687,9 +6477,11 @@ "{2}" msgstr "" +"Версия {0} дата создания: {1} автор: " +"{2}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 #, java-format msgid "Version {0} created on {1} by {2}" -msgstr "" +msgstr "Версия {0} дата создания: {1} автор: {2}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19 @@ -5697,59 +6489,59 @@ msgstr "Версия" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Изображения для {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "Прочесть GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Нет указания времени для точки {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Невозможно прочесть время \"{0}\" у точки {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Не найдено изображений с информацией о времени." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Чтение {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Изображения с данными о местоположении" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "Начало GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "Конец GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "текущая разница: {0} с." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "разница в часовых поясах: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5758,138 +6550,128 @@ msgstr[2] "изображений" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} в пределах трека" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Синхронизация часов" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "Изображения JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Невозможно прочесть дату из файла \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "EXIF файла \"{0}\" не содержит информации о времени." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Изображение" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "Часовой пояс GPS объекта (отличается от фотографии)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Синхронизировать время с GPS приёмником" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "Введённое время невозможно использовать" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "точка GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Настроить отрисовку линий" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Использовать глобальные настройки." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Отображать линии между точками для этого слоя." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Не отображать линии между точками для этого слоя." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Выбрать варианты отрисовки линий" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Выбрать цвет" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "По умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Выбор цвета" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "Маркеры из именованых точек" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "Назвать маршрутные точки из {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Импортировать аудиофайлы" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Аудиофайлы Wave (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "Аудиомаркеры из {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Импорт изображений" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5899,5 +6681,5 @@ msgstr[2] "{0} дорожек, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5907,5 +6689,5 @@ msgstr[2] "{0} маршрутов, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5915,30 +6697,30 @@ msgstr[2] "{0} путевых точек" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Название: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Описание: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Временной интервал: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Длина: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Преобразовать в слой данных" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5948,43 +6730,43 @@ "
Если хотите загрузить трэк, сделайте это по ссылке:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Преобразовано из: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "Скачать с JSM данные вдоль трэка" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Скачать всё в пределах:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} метров" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Максимальная область для одного запроса:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} кв. км." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5995,9 +6777,9 @@ "Продолжить?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "На слое отсутствует трек GPX, чтобы наложить звук." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -6007,5 +6789,5 @@ "будут пропущены или перенесены в начало трека." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -6015,47 +6797,48 @@ "их время, были проигнорированы." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Слой данных {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "вне области для скачивания" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "версия {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +"Внимание: совместное использование данных версий 0.6 и 0.5 в версии 0.5" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} состоит из:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} удалено)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "отключено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "Версия API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Преобразовать в слой GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -6081,5 +6864,5 @@ msgstr[2] "треков" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -6088,5 +6871,5 @@ msgstr[2] "точек" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -6096,5 +6879,5 @@ msgstr[2] "трек с {0} точками" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -6104,5 +6887,5 @@ msgstr[2] "{0} состоит из {1} треков" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -6123,5 +6906,5 @@ msgstr[2] "маркеров" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6131,9 +6914,9 @@ msgstr[2] "{0} состоит из {1} маркеров" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Синхронизировать аудио" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." @@ -6141,20 +6924,20 @@ "Вам необходимо приостановить звуковой файл в момент воспроизведения реплик." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Аудио синхронизировано на точке {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Невозможно синхронизировать слой который используется" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "Установить маркер аудио на позиции проигрывания" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6164,10 +6947,17 @@ "маркер." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "Нет существующих аудио маркеров на этом слое" -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Показать/скрыть текст/значки" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "Показать/скрыть текст и значки маркеров." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6177,5 +6967,5 @@ "которым связана звуковая дорожка (после первого маркера)." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6185,29 +6975,29 @@ "или на точку трека, где вы хотите синхронизировать." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Невозможно создать новый аудио-маркер." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "Произошла ошибка при попытке показать URL для этого маркера" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(по ссылке: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Невозможно отобразить URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Дополнительные параметры" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Установка параметров напрямую. Пользоваться с осторожностью!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6215,26 +7005,26 @@ msgstr "Поиск: " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "Текущее значение - по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "Текущее значение - ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "Значение по умолчанию неизвестно (настройка ещё не использовалась)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Пожалуйста, выберите ряд для редактирования." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6242,14 +7032,14 @@ msgstr "Новое значение для {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Пожалуйста, выберите ряд для удаления." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Введите новый ключ и значение" @@ -6389,40 +7179,40 @@ msgstr "Калибровка звукозаписи" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Цвет" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "Стиль точки {0}:{1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Слой: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Выбрать" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Выберите цвет для {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "Задать в значение по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "Задать все значения по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Цвета, используемые разными объектами в JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Цвета" @@ -6765,48 +7555,57 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +msgstr "Использованный стиль" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Настроить доступные модули." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Скачать список" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Обновить" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Настроить сайты..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +msgstr "Добавить ссылку на описание JOSM плагина" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "Пожалуйста, выберите запись." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +msgstr "Редактировать ссылку на описание JOSM плагина" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "JOSM Plugin description URL" +msgstr "Добавить ссылку на описание JOSM плагина" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" msgstr "Настроить сайты с модулями" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Настройки экрана" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6814,29 +7613,29 @@ msgstr "Различные настройки, влияющие на внешний вид программы." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Параметры соединения" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Параметры соединения с сервером OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Настройки карты" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Параметры проекции карты и отображения данных" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Параметры Аудио" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "Параметры звукового проигрывателя, и звуковых маркеров." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "Необходимо перезапустить JOSM, чтобы изменения вступили в силу." @@ -6888,5 +7687,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42 msgid "Login name (e-mail) to the OSM account." -msgstr "" +msgstr "Логин (e-mail) учётной записи OSM" #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43 @@ -6901,5 +7700,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47 msgid "OSM username (e-mail)" -msgstr "" +msgstr "Имя пользователя на OSM (e-mail)" #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49 @@ -6940,59 +7739,61 @@ msgstr "Горячая клвиша" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +msgstr "Краткое описание: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +msgstr "URL: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +msgstr "Автор: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +msgstr "Веб-страница: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +msgstr "Версия: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +msgstr "Пути к иконкам" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +msgstr "Копировать умолчания" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "Пожалуйста, выберите ряд для копирования." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +msgstr "Добавить новый XML источник к списку." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "Удалить источник из списка." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -7180,33 +7981,33 @@ msgstr "Группы модификаторов" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Подробнее" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Дополнительные атрибуты:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Использовать шаблон ''{0}'' из группы ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Использовать шаблон ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "замкнутая" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Неизвестный тип: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7217,15 +8018,15 @@ msgstr "Не удалось прочитать помеченные настройки исходника: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Ошибка при разборе {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Элемент типа {0} не поддерживается." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7236,18 +8037,18 @@ msgstr[2] "Изменить {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Ничего не выбрано!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "Элементы выбраны неверно!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Применить шаблон" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Изменить параметры" @@ -7258,33 +8059,36 @@ msgstr "Группа настроек ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Подключение к серверу OSM..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Загрузка точек с {0} до {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "Скачивание данных OSM..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "Ошибка! Возможно отсутствуют тэги." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Подготовка данных..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Невозможно прочитать \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7292,24 +8096,24 @@ msgstr "GPS файлы" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Маркеры из {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "Файл \"{0}\" не существует" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" -msgstr "" +msgstr "Парсинг файла \"{0}\" потерпел неудачу" #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 @@ -7322,59 +8126,79 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "Скачивание данных OSM..." + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format +msgid "Fetching {0} with id {1} from ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +msgstr "Сервер выдал ошибку 404 для id {0}. Пропускаем" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " "for each primitive" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +"Сервер выдал ошибку 404, повторная попытка индивидуальными запросам для " +"каждого примитива" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "NMEA-0183 файлы" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Координаты импортированы: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Неправильно составленные предложения: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Ошибки контрольных сумм: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Неизвестные предложения: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Пустые координаты: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "Импорт NMEA успешно завершён" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "Сбой при импорте NMEA!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +msgstr "отсутствует пункт настройки \"{0}\". Не могу инициализировать OsmApi" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "Эта версия JOSM несовместима с настроенным сервером." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7385,59 +8209,74 @@ "поддержке {0} до {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "Соединение с {0} установлено используя протокол {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +msgstr "сервер вернул неожиданный формат id, текущее значение \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" "unexpected format of new version of modified primitive ''{0}'', got ''{1}''" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +"неожиданный формат новой версии изменённого примитива \"{0}\", текущее " +"значение \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Открывается список правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Закрывается список правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "Нет изменений для выгрузки" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Подготовка..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Закачка..." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Скнирование каталога {0}" + #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91 #, java-format msgid "(Code={0})" -msgstr "" +msgstr "(Код={0})" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93 #, java-format msgid "The server replied an error with code {0}" -msgstr "" +msgstr "Сервер возвратил ошибку с кодом {0}" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 msgid "OSM Server Files bzip2 compressed" -msgstr "" +msgstr "Файлы сервера OSM сжаты с помощью bzip2" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 msgid "Invalid bz2 file." -msgstr "" +msgstr "bz2 файл содержит ошибки" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73 @@ -7461,12 +8300,7 @@ msgstr "Идентификатор пользователя" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Прерывание..." - #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 msgid "OSM Server Files gzip compressed" -msgstr "" +msgstr "Файлы сервера OSM сжаты с помощью gzip" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68 @@ -7525,115 +8359,141 @@ "текущее значение ''{1}''" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Ошибка при разборе." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "OSM файлы сервера" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Неизвестная версия" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "Номер версии отсутствует по данным OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "Версия неизвестна: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "Найден элемент вне пути." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr "у нет ссылок ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "Найден тэг вне отношения." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +msgstr "Отсутствует атрибут \"ref\" участника отношения {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +"Неверное значение атрибута \"ref\" участника отношения {0}, текущее значение " +"{1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +msgstr "Отсутствует атрибут \"type\" участника {0} в отношении {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Неполная спецификация с ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Недопустимый объект с id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" "Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +"Неверное значение атрибута \"version\" OSM примитива с id {0}, текущее " +"значение {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "Отсутствует атрибут \"version\" OSM примитива с id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Отсутствует необходимый атрибут \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "" -"Пропуск линии потому, что она включает в себя узлы, которые не существуют: " -"{0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Подготовка данных..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "Неверный номер точки" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "требуется параметр id ''{0}'' > 0. Получен {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "требуется параметр ''{0}'' > 0. Получен {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "ожидался параметр ''{0}'' >= 0, текущее значение ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "Загрузка истории..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Соединение с сервером..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "Не удалось установить соединение с API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7642,5 +8502,18 @@ "соединение." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} осталось. Загрузка {4}: {5} (id: {6})" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#, java-format +msgid "" +"Failed to close changeset {0}, will be closed by server after timeout. " +"Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 #, java-format msgid "" @@ -7649,16 +8522,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} осталось. Загрузка {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Обновить модули" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Скачать модули" @@ -7675,5 +8543,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7683,23 +8551,23 @@ msgstr[2] "{0} Плагины успешно загружены. Пожалуйста, перезагрузите JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "Загрузка Плагина {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "Пропустить загрузку" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "JOSM версии {0} требует плагин {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "Загрузить Плагин" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "Пропустить Загрузку" @@ -7710,34 +8578,32 @@ msgstr "В модуле {0} произошла ошибка" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "Внимание - произошёл запрос на загрузку модуля {0}. Этот модуль больше не " "требуется." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "Плагин {0} требует обновление JOSM до версии {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Модуль {0} требуется модулю {1}, но не найден." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Модуль не найден : {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Последнее обновление модулей более {0} дней назад" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7747,21 +8613,21 @@ "предупреждение, установив параметр настроек 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Отключить модуль" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Невозможно загрузить модуль {0}. Удалить из настроек?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "Сохранение плагина" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7771,5 +8637,5 @@ "разрешение переписывать существующие модули." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7777,10 +8643,10 @@ msgstr "Произошла неожиданная ошибка. Возможно, она вызвана модулем ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Согласно информации в модуле, автором является {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7789,9 +8655,9 @@ "ошибке." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Отключить модуль?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7801,26 +8667,23 @@ "модуль." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Информация" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Информации о модулях не найдено." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "описание отсутствует" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Подробнее" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7830,13 +8693,18 @@ msgstr[2] "Скачать информацию о модуле с {0} сайтов" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Информации о модулях не найдено." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "Плагин {0} не доступен. Обновление пропущено." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Все установленные модули имеют последнюю версию." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7849,9 +8717,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Скачивание недостающих модулей" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7864,57 +8732,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "неизвестный" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Версия {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Модуль из поставки JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Ошибка чтения файла с описанием модуля: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Это позже конца записи" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Ошибка при воспроизведении звука" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Ничего не делать" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Сообщить об ошибке" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7928,14 +8774,14 @@ "последней версией JOSM, будьте добры, отправьте отчёт об ошибке." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Неожиданная ошибка" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Пожалуйста, создайте отчёт об ошибке по адресу {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -7943,5 +8789,5 @@ "подробнее!)" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7951,17 +8797,33 @@ "ошибке." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Прикрепите следующую информацию к отчёту:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(Текст уже скопирован в буфер обмена)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Больше не показывать" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "Не могу найти перевод {0}. Возвращено {1}." + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7974,5 +8836,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7982,5 +8844,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7991,13 +8853,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Подсказка: Горячие клавиши можно назначить в настройках программы)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "Создать сетки линий" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -8007,21 +8884,21 @@ "имеют различные узлы и один общий" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "Выберите две линии, с общим узлом" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "Выберите два пути с единственным общим узлом" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "Создание сетки линий" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "Загрузка трэка" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -8029,74 +8906,75 @@ msgstr "Загрузка трэков" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Публичный" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "Выбор сделает ваш трэк общественным на сайте openstreetmap.org" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Описание" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "Пожалуйста введите описание вашего трэка" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "Введите теги описывающие ваш трэк." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "Выбранный трэк: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Подключение..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "Загрузка отменена" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Ошибка во время загрузки" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "Загрузка GPX успешно закончена" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "Загрузка прервалась. Сервер ответил следующим сообщением: " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Загрузка GPX трэка: {0}% ({1} из {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Нет описания. Просьба представить некоторое описание." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Слой GPX не выбран. Не удается загрузить трэк." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Нет имени пользователя" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Нет пароля" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Загрузка GPX трэка" @@ -8166,33 +9044,34 @@ msgstr "Один из выбранных файлов пуст!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Загрузка фото..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Не удалось получить канонический путь к каталогу {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "Скнирование каталога {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "Найден пустой файл в каталоге {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Ошибка чтения файлов в каталоге {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "Коррелируют с GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8212,15 +9091,15 @@ msgstr "Файлы GPX (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Файл {0} загружен под именем \"{1}\"" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Ошибка разбора {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8232,34 +9111,34 @@ "прочитаете на фото и выберите часовой пояс
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "Время фотоснимка (из EXIF):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "Время GPS (прочтите на фото вверху): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [дд/мм/гггг чч:мм:сс]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "Я нахожусь в часовом поясе: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "Без даты" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "Открыть другое фото" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Синхронизация времени с фотографией GPS-приемника" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8269,70 +9148,70 @@ "Пожалуйста, используйте запрашиваемый формат" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "Недопустимая дата" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "<Не загружены треки GPX>" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "Трек GPX: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "Открыть другой трек GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "Часовой пояс: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "Смещение:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" "Я могу сфотографировать экран GPS приёмника.
Это поможет?" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "Обновление позиции для: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "Все изображения" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "Изображения без координат в заголовках Exif" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "Картинки без ярлыков" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "Сопоставить изображения с GPX треком" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "Совпадения" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "Авто-Угадывание" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "Необходимо выбрать трек GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "Не выбрано трека GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8343,9 +9222,9 @@ "Ожидаемый формат: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "Недопустимый часовой пояс" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8356,26 +9235,26 @@ "Ожидаемый формат: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "Недопустимое смещение" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "Надено {0} совпадений из {1} в GPX трэке {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "Трек GPX загружен" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "ыбранные фотографии не содержат информацию о времени." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "Фотографии не содержать информацию о времени" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." @@ -8383,53 +9262,55 @@ "Точки в выбранном GPX треке не содержат времени. Пожалуйста, выберите другой." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "GPX трек не содержит информации о времени" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "Часовой пояс: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "Минуты: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "Секунды: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "Совпавшие {0} из {1} фотографий с GPX треком." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "(Разница во времени {0} дней)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "Смещение между треком и фотографией: {0}м {1}с" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " "adjust the sliders to manually match the photos." msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +"Произошла ошибка во время попытки сопоставить фотографии с GPX треком. Вы " +"можете вручную сопоставить фотографии использую ползунки." + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "Сопоставление фотографий треку прервано" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "Настройка часового пояса и смещения" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "Значения по умолчанию" @@ -8451,5 +9332,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Ошибка при загрузке файла" @@ -8472,6 +9353,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: Не правильная ссылка" @@ -8650,22 +9531,22 @@ msgstr "Добавить \"source=...\" к элементам?" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "Загружается {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "Соединение с WMS Server..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "Создание зданий" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8675,18 +9556,18 @@ "размер импортируемого здания ограничено, максимум 1 км2 ." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "Пожалуйста, включите Авто-источники и проверте millesime кадастр." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "Экспортировать окно просмотра SVG" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "Выделить лучшее расположение границы" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "Создать границы" @@ -8788,5 +9669,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 msgid "Adjust the position of the WMS layer (raster images only)" -msgstr "" +msgstr "Подогнать позицию WMS слоя (только растровые изображения)" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19 @@ -8805,6 +9686,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Пустой слой" @@ -8833,5 +9714,5 @@ msgstr "общий квадрат: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8842,14 +9723,14 @@ "Создайте новый файл." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 msgid "Cache Format Error" msgstr "Ошибка формата кеша" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 +msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 msgid "Cache Lambert Zone Error" msgstr "Ошибка кеширования зоны Ламберта" @@ -8891,5 +9772,5 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 msgid "Split area" -msgstr "" +msgstr "Разделить область" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -8922,5 +9803,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65 msgid "TCX Files (*.tcx)" -msgstr "" +msgstr "Файлы TCX (*.tcx)" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -8937,4 +9818,9 @@ msgstr "Создать копию линии" +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Никаких данных не загружено" + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8945,9 +9831,9 @@ msgstr "Создать копию линии" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "Слой для редактирования GPX трэков" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "Преобразовать в GPX слой с обезличенным временем" @@ -9068,30 +9954,30 @@ msgstr "удалить данные после импорта" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "Импортирование данных с устройства." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "Импортирование данных с DG100..." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "Ошибка удаления данных." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "Импортированы данные с {0}" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "На устройстве не найдено данных." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "Ошибка подключения." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -9103,14 +9989,14 @@ "mack.de/josm-globalsat-gpx-import-plugin/" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "Импорт с Globalsat" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "Импортировать данные с Globalsat Datalogger DG100 на слой GPX." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "Импортировать" @@ -9201,40 +10087,40 @@ msgstr "Открыть изображения в ImageWayPoint" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "Индекс направления '{0}' не найден" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "Начальное положение за границами рамки." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "Поиск береговой линии..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "найдено {0} точек..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 msgid "Lake Walker." msgstr "Трассировщик озёр" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "Трассировщик озёр" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "Ошибка создания директории кэша: {0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "Трассировка" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "проверка кэша..." @@ -9243,26 +10129,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "Упрощение геометрии..." -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "Аппроксимация Douglas-Peucker..." -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "Удаление повторяющихся точек..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "Трассировщик озёр" @@ -9347,7 +10225,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "вода" @@ -9505,9 +10383,9 @@ msgstr "Настройки модуля Lakewalker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "Скачивается квадрат изображения..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "Невозможно получить изображение" @@ -9758,18 +10636,18 @@ msgstr "Неизвестный статус проблемы" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Открыть видимое..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "Открыть только файлы, видимые в текущей области на экране" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "Не открыта область - невозможно определить границы!" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9796,33 +10674,33 @@ msgstr "исполняемый файл Firefox" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "загрузить данные из API" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "изменить выделение" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "изменить область просмотра на экране" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "подтверждать все действия удалённого управления вручную." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "Модуль, позволяющий другим приложениям управлять JOSM" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "Дистанционное управление" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "Настройки модуля дистанционного управления" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9834,29 +10712,29 @@ "приложений, подключающихся к модулю." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "Разрешённые действия" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "" "модуль дистанционного управления получил запрос на загрузку данных из API." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "Подробности запроса: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "Разрешить действие?" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "Подтверждение действия дистанционного управления" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -9867,9 +10745,9 @@ #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 msgid "Edit relation" -msgstr "" +msgstr "Редактировать отношение" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 msgid "Edit relations" -msgstr "" +msgstr "Редактировать отношения" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:72 @@ -9987,5 +10865,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 msgid "image " -msgstr "" +msgstr "изображение " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -10124,4 +11002,27 @@ msgstr "Выделение" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "Обновление свойств {0} объекта" +msgstr[1] "Обновление свойств {0} объектов" +msgstr[2] "Обновление свойств {0} объектов" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" +"Неожиданная версия JOSM. Ни Main.ds, ни Main.getCurrentDataSet() не найдены." + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10146,5 +11047,5 @@ #, java-format msgid "unexpected column number {0}" -msgstr "" +msgstr "неожиданный номер колонки {0}" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -10380,29 +11281,29 @@ "Открывает диалоговое окно, которое позволяет перейти к определенной местности" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "Введите Lat / Lon, чтобы перейти к позиции." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "Вы также можете вставить URL из www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "Приближение (в метрах)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "Перейти туда" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "Перейти к позиции" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" @@ -10410,5 +11311,5 @@ "проверьте." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "Невозможно разобрать широту/долготу" @@ -10446,6 +11347,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Ошибки при проверке" @@ -10455,10 +11356,10 @@ msgstr "Проверка не выявила ошибок" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Сетка" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10549,23 +11450,15 @@ msgstr "Произвести проверку данных" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "Данные содержат ошибки. Всё равно продолжить?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Открыть окно проверки" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Показать проблему" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Проверить" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "Проверить выделенное, либо все загруженные данные" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10638,22 +11531,22 @@ msgstr "Пересекающиеся линии" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "Дублированные узлы" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "Этот тест проверяет, чтобы не было совпадения узлов." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "Повторяющиеся точки" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "Ищет линии с различными точками, имеющими одинаковые координаты" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "Дублирующиеся узлы на линии" @@ -10730,24 +11623,24 @@ "Этот тест ищет линии с похожими названиями. Возможно, это вызвано опечатками." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "Проверка параметров:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" "Этот плагин проверяет на наличие ошибок в названиях ключей и их значений." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Неправильно просталенныех тегов линиий - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Ошибка проверки правописания строки: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10758,7 +11651,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "Неправильная комбинация тегов/значений тегов" @@ -10766,78 +11659,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "Проблемы отображения" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "Неправильный ключ {0}." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "Пустые значения тегов" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "Неверный ключ свойств" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "Неправильный пробел в названии ключа" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "Значение начинается или заканчивается пробелом" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "Значения содержат HTML разметку" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Ключа ''{0}'' нет в настройках." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "Установки не содержат собственно ключа" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Значение ''{0}'' для ключа ''{1}'' не установлены заранне." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "Не содержит зарание устанвленного значения" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "Проверьте ключи свойств." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "Проверьте, что ключ действителен проверен в отношении списка слов." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "Использовать сложную проверку" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "Проверка собственных значений и использование сложных правил тегов." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "Исходники TagChecker" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10847,21 +11742,21 @@ "openstreetmap.org/index.php/User:JLS/speller) или тег проверки файлов данных." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "Добавить в список новый источник." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "Править выбранный источник." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "Источники данных" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "Проверьте правильно значений" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" @@ -10869,41 +11764,41 @@ "установок проверки." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "Проверить для FIXMES." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Ищет узлы или линии с FIXME в свойствах какого-либо значения." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "Проверить заметки." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "Проверить содержит ли нарисованная карта ошибки данных" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "Использовать файл данных по умолчанию." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "Используется файл данных установленный по умолчанию" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "Использовать установленный по умолчанию файл проверки правописания" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" @@ -10911,22 +11806,22 @@ "(рекомендуется)" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "Исправить параметры" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "Не удалось найти тип элемента" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "Не удалось найти уровень предупреждения" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "Недопустимое выражение ''{0}''" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -11071,7 +11966,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "здание" @@ -11085,5 +11980,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "область" @@ -11118,10 +12013,10 @@ msgstr "Конечный узел связной линии возле другой линии" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "Непомеченные и не соединённые узлы" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "Этот тест ищет точки, не имеющие тегов, и не являющиеся частью линий." @@ -11175,8 +12070,34 @@ msgstr "Неверное направление линии суши: земля не слева" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "Сканированная карта..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" +"Показать карту, которая ранее была отсканирована и загружена на walking-" +"papers.org" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "Введите URL или ID (часть после ?id= в URL) на walking-papers.org" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "Walking Papers: {0}" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -11187,10 +12108,10 @@ msgstr "Выделите начальный узел в конце пути" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "Достигнут конец линии" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "Достигнут перекрёсток" @@ -11261,14 +12182,14 @@ msgstr "Справка по модулю WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "Трансформированное изображение..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "Загрузить привязанные изображения с различных сервисов" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -11279,26 +12200,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "Индивидуальная ссылка WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "Домашняя страница" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "WMS URL или ID Изображения:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "Добавить привязанное изображение" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11308,5 +12229,5 @@ "Пожалуйста попробуйте ещё раз." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "Нет верных WMS URL или ID" @@ -11316,5 +12237,5 @@ msgstr "Отрегулируйте положение выбранного слоя WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11325,19 +12246,19 @@ "Это может привести к неправильным координатам." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Автоматическое скачивание" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -11346,37 +12267,37 @@ "измените разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "Скачать видимые квадраты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Изменить разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "Перезагрузить ошибочные фрагменты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "Альфа канал" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 msgid "Save WMS layer to file" msgstr "Сохранить слой WMS в файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 msgid "Save WMS layer" msgstr "Сохраниеть WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 msgid "Load WMS layer from file" msgstr "Загрузить слой WMS из файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Load WMS layer" msgstr "Загрузить WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -11384,51 +12305,51 @@ "Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Ошибка формата файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Открыть пустой WMS-слой для загрузки данных из файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "Настройки модуля WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "Измениить список серверов WMS, отображаемых в меню модуля WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Название меню" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "Ссылка на WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "Имя пункта меню (по умолчанию)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "WMS URL (по умолчанию)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "Введите имя пункта меню и URL этого WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "Копия поумолчанию" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "Загрузчик" @@ -11514,4 +12435,5 @@ "Creating and handling address nodes and buildings within Czech Republic." msgstr "" +"Создание и управление адресованными узлами и зданиями в Чешской Республике" #. Plugin dataimport @@ -11551,11 +12473,16 @@ "JOSM." +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "Предоставлен фоновый слой который отображает сетку на карте" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11568,10 +12495,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Помогает векторизовать изображения WMS." #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11580,5 +12507,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11591,5 +12518,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11602,15 +12529,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "Отобразить фоновый рисунок OpenLayers" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "Импорт вопросов из OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11620,5 +12547,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11626,5 +12553,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11635,15 +12562,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "Великолепный JGoodies Пластиковый Скин." #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "Разрешить другим приложениям посылать команды JOSM." #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11654,10 +12581,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "Предоставляет возможности маршрутизации." #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11668,15 +12595,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "Разрешить добавить теги/узлы на текущей GPS позиции." #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Показывает окно для редактирования тегов в табличной сетке." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11690,10 +12617,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "Сделать ряд домов вдоль улицы из одного блока." #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11705,5 +12632,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11714,5 +12641,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11723,11 +12650,18 @@ "правописание для комплексных имён тегов." +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "Быстрая загрузка вдоль большого набор пересекающихся линий" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12884,58 +13818,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12949,6 +13831,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "Автобан" @@ -12974,6 +13856,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "Автострада" @@ -12999,6 +13881,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "Основная" @@ -13024,6 +13906,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "Вторичная" @@ -13037,5 +13919,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "Третичная" @@ -13053,5 +13935,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "местного значения" @@ -13085,6 +13967,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "Служебная" @@ -13111,6 +13993,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "Строительство" @@ -13160,5 +14042,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "Круг" @@ -14137,5 +15019,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "Болото" @@ -15866,27 +16748,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "спорт" @@ -16334,5 +17216,5 @@ #: build/trans_presets.java:1925 msgid "Swimming" -msgstr "Плаванье" +msgstr "Плавание" #. item @@ -18725,7 +19607,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "велосипедный" @@ -18795,7 +19677,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "пеший" @@ -18821,5 +19703,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "метро" @@ -19310,13 +20192,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "уменьшать" @@ -19358,5 +20240,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "лошадь" @@ -19576,4 +20458,66 @@ msgstr "ограждение" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "Автомагистраль" + #. color tertiary #. @@ -19608,6 +20552,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "улица" @@ -19663,7 +20607,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "шоссе" @@ -19719,8 +20663,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "железная дорога" @@ -19741,5 +20685,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "услуги" @@ -19753,5 +20697,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "брод" @@ -19772,5 +20716,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "кольцо" @@ -19785,5 +20729,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "пункт неотложной помощи" @@ -19798,5 +20742,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "берег реки" @@ -19810,5 +20754,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "поток" @@ -19822,5 +20766,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "док" @@ -19848,5 +20792,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "акведук" @@ -20014,13 +20958,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "искусственный" @@ -20082,7 +21026,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "железнодорожная станция" @@ -20105,10 +21049,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "другая жд дорога" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "жд дорога сверху" @@ -20144,7 +21088,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "Старая жд дорога" @@ -20189,6 +21133,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "воздушная трасса" @@ -20202,5 +21146,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "пассажирский терминал" @@ -20222,5 +21166,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "воздушная трасса темная" @@ -20234,5 +21178,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "воздушная трасса светлая" @@ -20280,7 +21224,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "воздушная трасса" @@ -20297,5 +21241,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "легкая трасси" @@ -20310,5 +21254,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "промежуточная трасса" @@ -20323,5 +21267,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "продвинутая трасса" @@ -20336,5 +21280,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "специалист лыжной трассы" @@ -20349,5 +21293,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "бесплатная трасса" @@ -20362,5 +21306,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "трасса для новичков" @@ -20465,10 +21409,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "энергия" @@ -20482,5 +21426,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "плотина" @@ -20494,5 +21438,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "трубопровод" @@ -20620,12 +21564,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "свободное время" @@ -20639,5 +21583,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "гавань" @@ -20709,8 +21653,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "использование" @@ -20812,10 +21756,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "режим использования" @@ -21201,22 +22145,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "легкое использование" @@ -21248,6 +22192,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "легкая вода" @@ -21308,8 +22252,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "здоровье" @@ -21662,26 +22606,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "Магазин" @@ -21753,8 +22697,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "отель" @@ -21904,9 +22848,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "туризм" @@ -21978,8 +22922,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "исторический" @@ -22050,8 +22994,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "зеленый" @@ -22065,5 +23009,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "карьер" @@ -22077,5 +23021,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "мусорная свалка" @@ -22097,5 +23041,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "водоём" @@ -22109,5 +23053,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "лес" @@ -22121,5 +23065,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "двор фермы" @@ -22142,5 +23086,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "розничная продажа" @@ -22154,5 +23098,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "промышленный" @@ -22166,5 +23110,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "заброшенная застройка" @@ -22178,5 +23122,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "участок для застройки" @@ -22190,5 +23134,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "жд разъезд" @@ -22245,7 +23189,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "военный" @@ -22259,5 +23203,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "кладбище" @@ -22270,5 +23214,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "пик" @@ -22283,5 +23227,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "ледник" @@ -22295,5 +23239,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "вулкан" @@ -22348,8 +23292,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "природный" @@ -22363,5 +23307,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "кустарник" @@ -22375,5 +23319,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "здоровье" @@ -22387,5 +23331,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "лес" @@ -22399,5 +23343,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "грязь" @@ -22411,5 +23355,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "пляж" @@ -22487,8 +23431,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "маршрут" @@ -22536,7 +23480,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "граница" @@ -22678,10 +23622,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "место" @@ -22729,6 +23673,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "адрес" @@ -22989,20 +23933,20 @@ #: build/trans_wms.java:13 msgid "Yahoo Sat" -msgstr "" +msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? #: build/trans_wms.java:14 msgid "OpenStreetMap" -msgstr "" +msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? #: build/trans_wms.java:15 msgid "OpenCycleMap" -msgstr "" +msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:16 msgid "TilesAtHome" -msgstr "" +msgstr "TilesAtHome" #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? @@ -23018,5 +23962,5 @@ #: build/trans_wms.java:22 msgid "Terraserver Topo" -msgstr "" +msgstr "Terraserver Topo" #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& @@ -23025,24 +23969,84 @@ msgstr "Terraserver Urban" -#~ msgid "Data Layer" -#~ msgstr "Слой данных" - -#~ msgid "Uploading data" -#~ msgstr "Загрузка данных" - -#~ msgid "Not implemented yet." -#~ msgstr "Ещё не реализовано." +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "Сбой инициализации API. Пожалуйста, попробуйте снова позднее." + +#~ msgid "API initialization failed" +#~ msgstr "Сбой инициализации API" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "Не найдено данных для обновления. Вы уже открыли скачанный слой данных?" + +#~ msgid "No data" +#~ msgstr "Нет данных" + +#~ msgid "Update failed" +#~ msgstr "Ошибка обновления" + +#~ msgid "Missing primitive" +#~ msgstr "Прошущен примитив" + +#~ msgid "Apply partial resolutions" +#~ msgstr "Применить частичное решение" + +#~ msgid "Layers: {0}" +#~ msgstr "Слои: {0}" + +#~ msgid "Conflict created" +#~ msgstr "Конфликт создан" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Удалить текущего участника из отношения" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме." + +#~ msgid "Validate" +#~ msgstr "Проверить" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Проверить выделенное, либо все загруженные данные" #~ msgid "Email" #~ msgstr "Электронная почта" -#~ msgid "Resolve Conflicts" -#~ msgstr "Разрешить конфликты" - -#~ msgid "There were conflicts during import." -#~ msgstr "При импортировании возникли конфликтные ситуации." - -#~ msgid "Object" -#~ msgstr "Объект" +#~ msgid "Contacting the OSM server..." +#~ msgstr "Соединение с OSM сервером..." + +#~ msgid "Aborting..." +#~ msgstr "Прерывание..." + +#~ msgid "position" +#~ msgstr "положение" + +#~ msgid "different" +#~ msgstr "различный" + +#~ msgid "true" +#~ msgstr "истина" + +#~ msgid "false" +#~ msgstr "ложь" + +#~ msgid "Change" +#~ msgstr "Изменить" + +#~ msgid "unnamed" +#~ msgstr "безымянный" + +#~ msgid "Rotate" +#~ msgstr "Вращать" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Разрешить {0} конфликтов в {1} объектах" + +#~ msgid "my version:" +#~ msgstr "моя версия:" #~ msgid "{0} object has conflicts:" @@ -23052,48 +24056,67 @@ #~ msgstr[2] "{0} объектов имеет конфликты." -#~ msgid "my version:" -#~ msgstr "моя версия:" +#~ msgid "Resolve Conflicts" +#~ msgstr "Разрешить конфликты" #~ msgid "their version:" #~ msgstr "их версия:" +#~ msgid "Click Reload to refresh list" +#~ msgstr "Нажмите \"Обновить\" для обновления списка" + +#~ msgid "Date" +#~ msgstr "Дата" + +#~ msgid "Object" +#~ msgstr "Объект" + +#~ msgid "Not implemented yet." +#~ msgstr "Ещё не реализовано." + +#~ msgid "Revert" +#~ msgstr "Откатить" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Тэги (пустое значение удаляет тэг)" + +#~ msgid "Add Selected" +#~ msgstr "Добавить выбранное" + +#~ msgid "Cannot connect to server." +#~ msgstr "Невозможно связаться с сервером." + +#~ msgid "There were conflicts during import." +#~ msgstr "При импортировании возникли конфликтные ситуации." + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Добавьте site-josm.xml, либо страницы Wiki" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Имя пользователя (e-mail) учётной записи OSM" + +#~ msgid "Commit comment" +#~ msgstr "Комментарий правки" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Сервер сообщил о внутренней ошибке. Попробуйте уменьшить область, или " +#~ "повторите попытку позже." + +#~ msgid "Occupied By" +#~ msgstr "Объект" + #~ msgid "resolved version:" #~ msgstr "Разрешённая версия:" -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Имя пользователя (e-mail) учётной записи OSM" - -#~ msgid "OSM username (email)" -#~ msgstr "Имя пользователя OSM (e-mail)" - -#~ msgid "Unknown host" -#~ msgstr "Неизвестный хост" - -#~ msgid "position" -#~ msgstr "положение" - -#~ msgid "different" -#~ msgstr "различный" - -#~ msgid "true" -#~ msgstr "истина" - -#~ msgid "false" -#~ msgstr "ложь" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Разрешить {0} конфликтов в {1} объектах" - -#~ msgid "Change" -#~ msgstr "Изменить" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Нажмите \"Обновить\" для обновления списка" - -#~ msgid "Revert" -#~ msgstr "Откатить" - -#~ msgid "Date" -#~ msgstr "Дата" +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Для работы модуля нужна более новая версия JOSM: {0}." + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Передача прервана из-за ошибки (повторная попытка через 5 с):" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "Используйте мышь, или Ctrl+стрелки/./ для изменения масштаба." #~ msgid "" @@ -23104,40 +24127,30 @@ #~ "правок." -#~ msgid "Rotate" -#~ msgstr "Вращать" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Тэги (пустое значение удаляет тэг)" - -#~ msgid "Error parsing server response." -#~ msgstr "Ошибка при разборе ответа от сервера." - -#~ msgid "Cannot connect to server." -#~ msgstr "Невозможно связаться с сервером." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "Используйте мышь, или Ctrl+стрелки/./ для изменения масштаба." - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Добавьте site-josm.xml, либо страницы Wiki" - -#~ msgid "Tagging preset source" -#~ msgstr "Источник предустановок тегов" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Добавить новый источник предустановки тегов в список." - -#~ msgid "Tagging preset sources" -#~ msgstr "Источники предустановок тегов" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Сервер сообщил о внутренней ошибке. Попробуйте уменьшить область, или " -#~ "повторите попытку позже." - -#~ msgid "Commit comment" -#~ msgstr "Комментарий правки" +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Ошибка при скачивании модуля: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Модуль уже существует" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Некоторые точки - (почти) на одной линии" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Подстроить положение слоя WMS" + +#~ msgid "Navigation" +#~ msgstr "Навигация" + +#~ msgid "Drawbridge" +#~ msgstr "Подъёмный мост" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "подложка Geofabrik.de" + +#~ msgid "Server does not support changesets" +#~ msgstr "Сервер не поддерживает управление версиями" + +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "Вы действительно желаете отметить проблему, как решённую?" #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -23147,79 +24160,6 @@ #~ msgstr[2] "{0} модулей успешно обновлено. Пожалуйста, перезапустите JOSM." -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Невозможно скачать модуль: {0} из {1} доступных" - -#~ msgid "Navigation" -#~ msgstr "Навигация" - -#~ msgid "image not loaded" -#~ msgstr "изображение не загружено" - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Масштабирование: Колесо прокрутки или двойной щелчок. Сдвинуть карту: " -#~ "Нажмите правую кнопку мыши и двигайте карту мышью. Выбор: щелчок." - -#~ msgid "Metacarta Map Rectifier image id" -#~ msgstr "ID изобрадения карты Metacarta Rectifier" - -#~ msgid "rectifier id={0}" -#~ msgstr "выпрямитель id={0}" - -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "Подстроить положение слоя WMS" - -#~ msgid "Charge" -#~ msgstr "Переодевание" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME Fix)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "Server does not support changesets" -#~ msgstr "Сервер не поддерживает управление версиями" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Передача прервана из-за ошибки (повторная попытка через 5 с):" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Для работы модуля нужна более новая версия JOSM: {0}." - -#~ msgid "Plugin already exists" -#~ msgstr "Модуль уже существует" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Ошибка при скачивании модуля: {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Некоторые точки - (почти) на одной линии" - -#~ msgid "Drawbridge" -#~ msgstr "Подъёмный мост" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "подложка Geofabrik.de" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "Вы действительно желаете отметить проблему, как решённую?" - -#~ msgid "Import TCX File..." -#~ msgstr "Импортировать файл TCX..." - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Импортировать файл TCX как трек GPS" +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Сделать все выбранные объекты участниками отношения" #~ msgid "" @@ -23232,4 +24172,70 @@ #~ "используйте ценный пароль." +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Скачать трансформированное изображение с WMS сервера Metacarta" + +#~ msgid "Portcullis" +#~ msgstr "Опускающаяся решётка" + +#~ msgid "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 46.1° and 57° only.\n" +#~ "Use another projection system if you are not using\n" +#~ "a French WMS server.\n" +#~ "Do not upload any data after this message." +#~ msgstr "" +#~ "Проекция \"{0}\" разработана только\n" +#~ "для широт между 46.1° и 57°.\n" +#~ "Используйте другую проекцию, если не пользуетесь\n" +#~ "французским сервером WMS. Не загружайте \n" +#~ "никаких данных на сервер после этого сообщения." + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "Архив с модулем уже существует. Скачать текущую версию и удалить " +#~ "существующий архив?\n" +#~ "\n" +#~ "{0}" + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Невозможно скачать модуль: {0} из {1} доступных" + +#~ msgid "Data Layer" +#~ msgstr "Слой данных" + +#~ msgid "OSM username (email)" +#~ msgstr "Имя пользователя OSM (e-mail)" + +#~ msgid "Error parsing server response." +#~ msgstr "Ошибка при разборе ответа от сервера." + +#~ msgid "" +#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " +#~ "move mouse. Select: Click." +#~ msgstr "" +#~ "Масштабирование: Колесо прокрутки или двойной щелчок. Сдвинуть карту: " +#~ "Нажмите правую кнопку мыши и двигайте карту мышью. Выбор: щелчок." + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Конфликты: {0}" + +#~ msgid "image not loaded" +#~ msgstr "изображение не загружено" + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "Открыть окно OpenStreetBugs, и включить автоматическое скачивание" + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "Модуль {0} поврежден, либо не скачался автоматически" + #~ msgid "" #~ "The sources (URL or filename) of tagging preset definition files. See " @@ -23239,6 +24245,107 @@ #~ "josm.openstreetmap.de/wiki/TaggingPresets для большей информации." -#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -#~ msgstr "Скачать трансформированное изображение с WMS сервера Metacarta" +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Добавить новый источник предустановки тегов в список." + +#~ msgid "Tagging preset sources" +#~ msgstr "Источники предустановок тегов" + +#~ msgid "Tagging preset source" +#~ msgstr "Источник предустановок тегов" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Импортировать файл TCX как трек GPS" + +#~ msgid "Import TCX File..." +#~ msgstr "Импортировать файл TCX..." + +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "Remove Selected" +#~ msgstr "Удалить выбранные" + +#~ msgid "Basic" +#~ msgstr "Основной" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Редактор отношений: {0}" + +#~ msgid "Move Down" +#~ msgstr "Переместить вниз" + +#~ msgid "Delete and Download" +#~ msgstr "Удалить и скачать" + +#~ msgid "Move Up" +#~ msgstr "Переместить вверх" + +#~ msgid "Edit Drawbridge" +#~ msgstr "Править подъёмный мост" + +#~ msgid "Edit Portcullis" +#~ msgstr "Править опускающуюся решётку" + +#~ msgid "The following errors occured during mass download:" +#~ msgstr "Эта ошибка вызвана в течении массовой загрузки:" + +#~ msgid "" +#~ "This action will require {0} individual download requests. Do you wish to " +#~ "continue?" +#~ msgstr "" +#~ "Это действие потребует {0} персонифицированного запроса на скачивание. Вы " +#~ "желаете продолжить?" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME Fix)" + +#~ msgid "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." +#~ msgstr "" +#~ "Пожалуйста выберите хотя бы один узел, путь или зависимость. Только у уже " +#~ "загруженных элементов есть история." + +#~ msgid "Helppage missing. Create it in english." +#~ msgstr "" +#~ "Страница справки отсутствует. Создайте её вenglish." + +#~ msgid "" +#~ "Helppage missing. Create it in english or your language." +#~ msgstr "" +#~ "Страница справки отсутствует. Создайте её в english " +#~ "или вашем языке." + +#~ msgid "" +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." +#~ msgstr "" +#~ "Произошла ошибка при попытке сопоставить фотографии с GPX треком. Вы " +#~ "можете настроить вручную с помощью ползунов соответствие фотографиям." + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "" +#~ "Пропуск линии потому, что она включает в себя узлы, которые не " +#~ "существуют: {0}\n" + +#~ msgid "Remove route nodes" +#~ msgstr "Удалить узлы маршрутизации" + +#~ msgid "Start routing" +#~ msgstr "Начать маршрутизацию" + +#~ msgid "No intersections found. Nothing was changed." +#~ msgstr "Пересечения найдено. Ничего не изменялось." #~ msgid "" @@ -23291,104 +24398,9 @@ #~ "есть сомнения в лицензионных правах на изображение, то не используйте его." -#~ msgid "Portcullis" -#~ msgstr "Опускающаяся решётка" - -#~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." -#~ msgstr "Модуль {0} поврежден, либо не скачался автоматически" - -#~ msgid "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 46.1° and 57° only.\n" -#~ "Use another projection system if you are not using\n" -#~ "a French WMS server.\n" -#~ "Do not upload any data after this message." -#~ msgstr "" -#~ "Проекция \"{0}\" разработана только\n" -#~ "для широт между 46.1° и 57°.\n" -#~ "Используйте другую проекцию, если не пользуетесь\n" -#~ "французским сервером WMS. Не загружайте \n" -#~ "никаких данных на сервер после этого сообщения." - -#~ msgid "" -#~ "Plugin archive already available. Do you want to download the current " -#~ "version by deleting existing archive?\n" -#~ "\n" -#~ "{0}" -#~ msgstr "" -#~ "Архив с модулем уже существует. Скачать текущую версию и удалить " -#~ "существующий архив?\n" -#~ "\n" -#~ "{0}" - -#~ msgid "Conflicts: {0}" -#~ msgstr "Конфликты: {0}" - -#~ msgid "viaduct" -#~ msgstr "виадук" - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "Открыть окно OpenStreetBugs, и включить автоматическое скачивание" - -#~ msgid "sports" -#~ msgstr "Спортивный" - -#~ msgid "" -#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#~ msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}" - -#~ msgid "Delete and Download" -#~ msgstr "Удалить и скачать" - -#~ msgid "No intersections found. Nothing was changed." -#~ msgstr "Пересечения найдено. Ничего не изменялось." - -#~ msgid "Solve Conflict" -#~ msgstr "Разрешить конфликт" - -#~ msgid "" -#~ "Please select at least one node, way or relation. Only already uploaded " -#~ "elements have a history." -#~ msgstr "" -#~ "Пожалуйста выберите хотя бы один узел, путь или зависимость. Только у уже " -#~ "загруженных элементов есть история." - -#~ msgid "" -#~ "This action will require {0} individual download requests. Do you wish to " -#~ "continue?" -#~ msgstr "" -#~ "Это действие потребует {0} персонифицированного запроса на скачивание. Вы " -#~ "желаете продолжить?" - -#~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You " -#~ "can adjust the sliders to manually match the photos." -#~ msgstr "" -#~ "Произошла ошибка при попытке сопоставить фотографии с GPX треком. Вы " -#~ "можете настроить вручную с помощью ползунов соответствие фотографиям." - -#~ msgid "The following errors occured during mass download:" -#~ msgstr "Эта ошибка вызвана в течении массовой загрузки:" - -#~ msgid "Edit Drawbridge" -#~ msgstr "Править подъёмный мост" - -#~ msgid "Edit Portcullis" -#~ msgstr "Править опускающуюся решётку" - -#~ msgid "Helppage missing. Create it in english." -#~ msgstr "" -#~ "Страница справки отсутствует. Создайте её вenglish." - -#~ msgid "" -#~ "Helppage missing. Create it in english or your language." -#~ msgstr "" -#~ "Страница справки отсутствует. Создайте её в english " -#~ "или вашем языке." - -#~ msgid "Directly load TCX files from JOSM." -#~ msgstr "Прямо загрузить TCX файлы из JOSM." +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "ID изобрадения карты Metacarta Rectifier" + +#~ msgid "rectifier id={0}" +#~ msgstr "выпрямитель id={0}" #~ msgid "" @@ -23401,9 +24413,30 @@ #~ "загрузки на OSM. Например, удалить неинтересные части трека." -#~ msgid "Remove route nodes" -#~ msgstr "Удалить узлы маршрутизации" - -#~ msgid "Start routing" -#~ msgstr "Начать маршрутизацию" +#~ msgid "Directly load TCX files from JOSM." +#~ msgstr "Прямо загрузить TCX файлы из JOSM." + +#~ msgid "Charge" +#~ msgstr "Переодевание" + +#~ msgid "sports" +#~ msgstr "Спортивный" + +#~ msgid "viaduct" +#~ msgstr "виадук" + +#~ msgid "Image with path {0} does not exist or is not readable." +#~ msgstr "Картинка {0} не существует или произошла ошибка чтения." + +#~ msgid "linked" +#~ msgstr "присоединенный" + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "Выгрузка прервана по неизвестной причине" + +#~ msgid "Cannot read numeric value from response" +#~ msgstr "Не возможно прочесть числовое знаечение из ответа" + +#~ msgid "Overlap tiles" +#~ msgstr "Накладывающиеся части" #~ msgid "" @@ -23422,16 +24455,4 @@ #~ "Не делайте выгрузку данных после данного сообщения." -#~ msgid "Cannot read numeric value from response" -#~ msgstr "Не возможно прочесть числовое знаечение из ответа" - -#~ msgid "Data upload failed for unknown reason" -#~ msgstr "Выгрузка прервана по неизвестной причине" - -#~ msgid "Image with path {0} does not exist or is not readable." -#~ msgstr "Картинка {0} не существует или произошла ошибка чтения." - -#~ msgid "Overlap tiles" -#~ msgstr "Накладывающиеся части" - #~ msgid "% of lat:" #~ msgstr "% широты:" @@ -23440,21 +24461,18 @@ #~ msgstr "% долготы:" +#~ msgid "Checking whether node {0} is gone ..." +#~ msgstr "Проверка существования узла {0} в прошлом..." + +#~ msgid "Undeleting relation..." +#~ msgstr "Восстановление удаленного отношения..." + #~ msgid "Undeleting Way..." #~ msgstr "Восстановление удаленного пути..." -#~ msgid "Checking whether node {0} is gone ..." -#~ msgstr "Проверка существования узла {0} в прошлом..." - -#~ msgid "Undeleting relation..." -#~ msgstr "Восстановление удаленного отношения..." - #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Проверка существования примитива {0} в прошлом..." -#~ msgid "Keep mine" -#~ msgstr "Сохранить мои" - -#~ msgid "Delete mine" -#~ msgstr "Удалить мои" +#~ msgid "Selection too big" +#~ msgstr "Выборка слишком большая" #~ msgid "" @@ -23482,7 +24500,16 @@ #~ "html>" -#~ msgid "Selection too big" -#~ msgstr "Выборка слишком большая" +#~ msgid "Keep mine" +#~ msgstr "Сохранить мои" + +#~ msgid "Delete mine" +#~ msgstr "Удалить мои" #~ msgid "image loading..." #~ msgstr "изображение загружается..." + +#~ msgid "WGS84 Geographisch" +#~ msgstr "ГСК WGS84" + +#~ msgid "Layer {0} must be in list of layers" +#~ msgstr "Слой{0} должен быть в списке слоев"