Index: applications/editors/josm/i18n/po/ru.po =================================================================== --- applications/editors/josm/i18n/po/ru.po (revision 17103) +++ applications/editors/josm/i18n/po/ru.po (revision 17485) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-18 13:46+0200\n" -"PO-Revision-Date: 2009-08-18 10:40+0000\n" -"Last-Translator: Kirill Zasorin \n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-09-04 18:39+0000\n" +"Last-Translator: Sergei Egorov \n" "Language-Team: Koptev Oleg \n" "MIME-Version: 1.0\n" @@ -17,79 +17,82 @@ "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-08-18 11:05+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:37+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:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/Main.java:193 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Creating main GUI" msgstr "Создание интерфейса" #. FIXME why is help not a JosmAction? -#: ../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:162 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 +#: ../core/src/org/openstreetmap/josm/Main.java:203 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:318 msgid "Help" msgstr "Справка" -#: ../core/src/org/openstreetmap/josm/Main.java:289 +#: ../core/src/org/openstreetmap/josm/Main.java:296 #, java-format msgid "The projection {0} could not be activated. Using Mercator" 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/OpenFileAction.java:60 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95 -#: ../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:45 -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87 -#: ../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/Main.java:297 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/Main.java:534 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344 -#: ../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/io/GpxExporter.java:172 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 -#: ../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:126 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 @@ -99,154 +102,164 @@ #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77 -#: ../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:163 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:282 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:289 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:218 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 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:400 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/Main.java:445 +#, fuzzy, java-format +msgid "" +"There are unsaved changes in {0} layer. Discard the changes and continue?" +msgid_plural "" +"There are unsaved changes in {0} layers. Discard the changes and continue?" +msgstr[0] "" +"Присутствуют несохранённые изменения. Сбросить изменения и продолжить?" +msgstr[1] "" +"Присутствуют несохранённые изменения. Сбросить изменения и продолжить?" +msgstr[2] "" +"Присутствуют несохранённые изменения. Сбросить изменения и продолжить?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Несохранённые изменения" -#: ../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:402 +#: ../core/src/org/openstreetmap/josm/Main.java:453 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save and Exit" msgstr "Сохранить и выйти" -#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/Main.java:453 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Отменить и выйти" -#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/Main.java:453 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222 -#: ../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:305 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 #: ../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/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../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:150 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 msgid "Cancel" msgstr "Отмена" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Игнорируется неверная ссылка: \"{0}\"" -#: ../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:206 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256 -#: ../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:69 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104 -#: ../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:347 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../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:360 -#: ../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:684 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/Main.java:478 +#: ../core/src/org/openstreetmap/josm/Main.java:497 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265 -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:92 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:144 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85 #: ../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:128 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 msgid "Warning" msgstr "Предупреждение" -#: ../core/src/org/openstreetmap/josm/Main.java:449 +#: ../core/src/org/openstreetmap/josm/Main.java:496 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Игнорируется неверный адрес файла: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:509 +#: ../core/src/org/openstreetmap/josm/Main.java:533 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:92 +#, fuzzy, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Невозможно прочесть файл: ''{0}''. Ошибка в:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -271,7 +284,8 @@ #: ../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:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -309,5 +323,5 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 #: build/trans_surveyor.java:64 msgid "Info" @@ -331,6 +345,6 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "Plugins" msgstr "Модули" @@ -345,8 +359,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 -#, java-format -msgid "" -"WARNING: unexpected format of API base URL. Redirection to history page for " -"OSM primitive will probably fail. API base URL is: ''{0}''" +#, fuzzy, java-format +msgid "" +"WARNING: unexpected format of API base URL. Redirection to info or history " +"page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" "ПРЕДУПРЕЖДЕНИЕ: неожиданный формат базового URL API. Перенаправление на " @@ -354,5 +368,15 @@ "''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, fuzzy, java-format +msgid "" +"WARNING: unexpected format of API base URL. Redirection to user page for OSM " +"user will probably fail. API base URL is: ''{0}''" +msgstr "" +"ПРЕДУПРЕЖДЕНИЕ: неожиданный формат базового URL API. Перенаправление на " +"страницу истории OSM примитива вероятно не выполнено. Базовый URL API: " +"''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -360,5 +384,5 @@ "связь." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -369,5 +393,5 @@ "примитивов" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Please select the target layer." msgstr "Пожалуйста выберите слой." @@ -375,13 +399,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 msgid "Select target layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +msgstr "Выбор слоя" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469 msgid "Merge" msgstr "Объединить" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -390,5 +414,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90 msgid "No target layers" msgstr "Не выбран слой" @@ -405,11 +429,11 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34 #: ../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/MergeSelectionAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 @@ -438,5 +462,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 msgid "Latitude" msgstr "Широта" @@ -445,30 +469,30 @@ #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 msgid "Longitude" msgstr "Долгота" +#: ../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:38 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254 msgid "Align Nodes in Circle" msgstr "Выстроить точки окружностью" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../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:38 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 +#: ../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:31 #: ../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:35 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../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:54 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -482,6 +506,6 @@ #: ../plugins/terracer/src/terracer/TerracerAction.java:72 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40 #, java-format @@ -489,59 +513,58 @@ msgstr "Инструмент: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../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:139 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 -#: ../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/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243 -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:334 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111 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:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131 msgid "Align Nodes in Line" msgstr "Выстроить точки линией" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 msgid "Move the selected nodes in to a line." msgstr "" "Переместить выделенные точки на прямую, проходящую через две крайние точки." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63 msgid "Please select at least three nodes." msgstr "Выделите не менее трёх точек." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -552,10 +575,10 @@ "- {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:108 msgid "API Capabilities Violation" msgstr "Нарушение возможностей API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -566,5 +589,5 @@ "примитиве {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -575,46 +598,46 @@ "допустимую длину {2}. Значение длины {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 msgid "Precondition Violation" msgstr "Нарушение предусловия" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:103 #, 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:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "данные" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "слой" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "выделение" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "конфликт" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "скачанное" +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57 #, java-format msgid "Zoom to {0}" msgstr "Показать {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom the view to {0}." msgstr "Изменить масштаб чтобы показать {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -624,22 +647,22 @@ msgstr "Вид: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124 msgid "Nothing selected to zoom to." msgstr "Ничего не выделено для показа." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124 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:72 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 msgid "Please select at least two ways to combine." msgstr "Выделите не менее двух линий для объединения." @@ -650,4 +673,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Объединить в любом случае" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -657,18 +684,7 @@ "объединить?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Объединить в любом случае" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Изменить направления?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 -msgid "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" -msgstr "" -"Линии с их текущими направлениями не объединить. Обратить некоторые линии?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -676,27 +692,33 @@ msgstr "Перевернуть и объеденить" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 +msgid "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" +msgstr "" +"Линии с их текущими направлениями не объединить. Обратить некоторые линии?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 msgid "Enter values for all conflicts." msgstr "Введите значения для всех конфликтов." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:206 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 msgid "Solve Conflicts" msgstr "Решение конфликтов" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #, java-format msgid "Combine {0} ways" msgstr "Объединить {0} линии" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 msgid "All the ways were empty" msgstr "Все линии были пустыми" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -706,32 +728,32 @@ "последовательностью точек." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 msgid "Copy" msgstr "Копировать" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:33 msgid "Copy selected objects to paste buffer." msgstr "Копировать выделенные объекты в буфер обмена." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:126 msgid "Please select something to copy." msgstr "Выделите что-нибудь для копирования." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 msgid "Create Circle" msgstr "Создать окружность" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../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:205 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 msgid "Those nodes are not in a circle. Aborting." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 +msgstr "Эти узлы не в круге. Операция прервана." + +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -741,20 +763,20 @@ #: ../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:285 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 #: ../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:674 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Удалить" @@ -764,85 +786,86 @@ msgstr "Удалить выделенные объекты." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:193 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194 msgid "Overwrite" msgstr "Перезаписать" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:193 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:32 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132 msgid "Distribute Nodes" msgstr "Распределить точки" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 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:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 msgid "Download map data from the OSM server." msgstr "Скачать картографические данные с сервера OSM." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 #: ../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:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 #, java-format msgid "File: {0}" msgstr "Файл: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Скачать" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74 msgid "Please select at least one task to download" msgstr "Выберите хотя бы один тип данных для загрузки." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "Загрузить зависимости с OSM..." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download primitives referring to one of the selected primitives" msgstr "Загрузить примитивы связанные с выбранными примитивами" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 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:1558 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." msgstr "За время импорта произошло {0} конфликт(ов)" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125 msgid "Conflicts during download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +msgstr "Конфликт в процессе загрузки" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -851,6 +874,6 @@ #: ../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/RelationListDialog.java:378 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415 msgid "Duplicate" msgstr "Дублировать" @@ -874,80 +897,86 @@ msgstr "Выйти из программы" +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Все изображения" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 msgid "Export to GPX..." msgstr "Экспорт в GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 msgid "Export the data to GPX file." msgstr "Экспортировать данные в GPX файл" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Нет данных для экспорта. Создайте данные." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56 -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 #, java-format msgid "paramenter ''{0}'' must not be null" msgstr "параметр ''{0}'' не должен быть нулевым" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." msgstr "ожидался экземпляр OsmDataLayer или GpxLayer. Получен ''{0}''." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50 +msgstr "Экспорт GPX-файла" + +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "Online-справка по JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 msgid "Open in Browser" msgstr "Открыть в браузере" -#: ../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:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266 -#: ../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 +#: ../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:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207 #: ../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:634 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633 msgid "Edit" msgstr "Правка" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Обновить" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:114 msgid "Can only edit help pages from JOSM Online Help" msgstr "Возможно только редактирование справочных страниц JOSM Online Help" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:199 #, java-format msgid "Error while loading page {0}" msgstr "Ошибка при загрузке страницы {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format msgid "Help page missing. Create it in english." @@ -955,5 +984,5 @@ "Страница справки отсутствует. Создайте её на английском." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -1001,28 +1030,32 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 msgid "Merge layer" -msgstr "" +msgstr "Соединить слои" #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 msgid "Merge the current layer into another layer" -msgstr "" - +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:78 +#: ../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:159 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 msgid "Merge nodes with different memberships?" msgstr "Объединить точки из разных отношений?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +msgid "Merge Anyway" +msgstr "Объединить в любом случае" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1032,9 +1065,5 @@ "объединить?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Объединить в любом случае" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -1042,69 +1071,69 @@ "используется." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 #, java-format msgid "Merge {0} nodes" msgstr "Объединить {0} точек" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 msgid "Merge selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgstr "Соединить выделение" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" -msgstr "" - +msgstr "Объедините выбранные примитивы в другой слой" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 #: ../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:76 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75 msgid "Mirror" msgstr "Зеркало" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 msgid "Mirror selected nodes and ways." msgstr "Зеркало выбранных узлов и путей." -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 msgid "Please select at least one node or way." msgstr "Пожалуйста, выберите хотябы один узел или путь." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "вверх" -#: ../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 +#: ../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 #, java-format msgid "Move objects {0}" msgstr "Переместить объекты {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "вниз" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "влево" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "вправо" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Переместить {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Moves Objects {0}" msgstr "Перемещает объекты {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 msgid "Cannot move objects outside of the world." msgstr "Невозможно переместить объекты за пределы мира." @@ -1112,5 +1141,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:339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337 msgid "New" msgstr "Создать" @@ -1120,17 +1149,22 @@ msgstr "Создать новую карту." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 msgid "Open..." msgstr "Открыть..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Открыть файл." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "Невозможно прочесть файл: ''{0}''. Ошибка в:
{1}" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Открыть файл." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Неизвестная роль «{0}»." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1170,13 +1204,13 @@ "градусов" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "Возможно выбрать только две точки" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 msgid "Selection must consist only of ways." msgstr "Возможно выбирать только линии." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select one or more closed ways of at least four nodes." msgstr "" @@ -1184,11 +1218,5 @@ "точек." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "" -"Пожалуйста, выберите контуры, у которых углы почти прямые, для применения " -"функции." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1197,9 +1225,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 msgid "Only one node selected" msgstr "Выбрана только одна точка" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Сделать углы прямыми" @@ -1215,13 +1243,28 @@ msgstr "Вставить содержимое буфера." -#: ../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:74 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Вставить тэги" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Применить тэги из буфера ко всем выделенным объектам." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, fuzzy, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Загрузка {0}" +msgstr[1] "Загрузка {0}" +msgstr[2] "Загрузка {0}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, fuzzy, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "Отменить удаление {0} примитивов" +msgstr[1] "Отменить удаление {0} примитивов" +msgstr[2] "Отменить удаление {0} примитивов" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1247,37 +1290,32 @@ msgstr "Вернуть последнее отменённое действие." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 msgid "Rename layer" msgstr "Переименовать слой" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Переименовать файл" -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 #, java-format msgid "Could not rename file ''{0}''" msgstr "Не возможно переименовать файл ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Изменить направление линии" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Изменить направление линии на противоположное." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 msgid "Please select at least one way." msgstr "Пожалуйста, выберите как минимум одну линию." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Изменить направление линии" @@ -1285,10 +1323,11 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 msgid "Save" msgstr "Сохранить" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 msgid "Save the current data." msgstr "Сохранить текущие данные." @@ -1299,37 +1338,25 @@ msgstr "Файл {0} существует. Перезаписать?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 msgid "No Exporter found! Nothing saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94 -msgid "" -"Internal Error: cannot check conditions for no layer. Please report this as " -"a bug." -msgstr "" -"Внутренняя ошибка: невозможно проверить условия без слоя. Пожалуйста, " -"создайте отчёт об ошибке." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "Нет открытых документов. Нечего сохранять." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Пустой документ" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "The document contains no data." msgstr "В документе не содержиться данных" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Сохранить в любом случае" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Конфликты" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1339,28 +1366,28 @@ "будут обработаны, как будто вы отменили их все. Продолжить?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Отказаться от конфликтов и сохранить" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "Сохранить файл OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Сохранить файл GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" 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 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 msgid "Save As..." msgstr "Сохранить как..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 msgid "Save the current data to a new file." msgstr "Сохранить текущие данные в новый файл." @@ -1395,33 +1422,33 @@ msgstr "Справка: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Отчёт о состоянии" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 msgid "Copy to clipboard and close" msgstr "Скопировать в буфер и закрыть" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../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 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:245 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Close" msgstr "Закрыть" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 msgid "Split Way" msgstr "Разделить линию" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 msgid "Split a way at the selected node." msgstr "Разделить линию в выбранной точке." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 msgid "The current selection cannot be used for splitting." msgstr "Текущее выделение невозможно разделить." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 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." @@ -1430,5 +1457,5 @@ msgstr[2] "Выбранные точки не являются частью пути." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1449,9 +1476,9 @@ "выберите путь ещё." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected nodes do not share the same way." msgstr "Выбранные точки не являются частью одной линии." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1460,10 +1487,10 @@ msgstr[2] "Выбранная линия не содержит выбранных точек" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251 msgid "You must select two or more nodes to split a circular way." msgstr "Чтобы разделить замкнутую линию, выберите две или более точки." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1473,5 +1500,5 @@ "линии)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1479,5 +1506,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1485,8 +1512,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 #, java-format msgid "Split way {0} into {1} parts" msgstr "Разделить линию {0} на {1} частей" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Закрывается список правок..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29 +#, fuzzy +msgid "Close the current changeset ..." +msgstr "Закрывается список правок..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 +msgid "There is currently no changeset open." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 +#, fuzzy +msgid "No open changeset" +msgstr "Открывается список правок..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Закрывается список правок..." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1504,52 +1556,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:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Дублировать точки, используемые несколькими линиями." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 msgid "This node is not glued to anything else." msgstr "Данная точка не связана с чем-либо еще." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 msgid "None of these nodes are glued to anything else." msgstr "Ни одна из этих точек не притянута к другим." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 msgid "None of this way's nodes are glued to anything else." msgstr "Ни одна из этих линий не притянута к другим." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "The current selection cannot be used for unglueing." msgstr "Выделенные объекты невозможно разъединить" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Выберите один из вариантов:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* Одна точка с тэгами, или" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One node that is used by more than one way, or" msgstr "* Одна точка, используемая несколькими линиями, либо" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +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: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: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:126 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1558,5 +1610,5 @@ "несколькими линиями." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1569,9 +1621,9 @@ "дубликаты точек, и все точки будут выбраны" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 msgid "Unglued Node" msgstr "Неприкрепленная точка" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 #, java-format msgid "Dupe into {0} nodes" @@ -1579,5 +1631,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1621,61 +1673,71 @@ msgstr "Обновить слой данных с сервера (скачать данные заново)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#. bounds defined? => use the bbox downloader +#. +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77 +msgid "Updating data" +msgstr "Обновление данных" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 msgid "No current dataset found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +msgstr "Не найден текущий набор данных" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 msgid "Didn't find a primitive with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "Не найден примитив с id {0} в текущем наборе данных" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Обновить выборку" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 msgid "Updates the currently selected primitives from the server" msgstr "Обновить выбранные примитивы с сервера" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 msgid "There are no selected primitives to update." msgstr "Не выбраны примитивы для обновления." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "Selection empty" msgstr "Выборка пуста" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 msgid "Upload to OSM..." msgstr "Загрузить на OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 msgid "Upload all changes to the OSM server." msgstr "Загрузить все изменения на OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135 +#, fuzzy, java-format +msgid "" +"There are unresolved conflicts in layer ''{0}''.
You have to " +"resolve them first." +msgstr "Присутствуют неразрешённые конфликты. Для начала, разрешите их" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Нечего загружать. Сначала создайте данные." -#: ../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:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Нет изменений для загрузки." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 #, java-format msgid "Synchronize {0} {1} only" msgstr "Синхронизированы только {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 msgid "Synchronize entire dataset" msgstr "Синхронизировать весь набор данных" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #, java-format msgid "" @@ -1697,17 +1759,17 @@ "редактирование.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280 msgid "Conflict detected" msgstr "Обнаружен конфликт" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293 #, java-format msgid "unexpected return value. Got {0}" msgstr "неожиданное возвращённое значение. Получено {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #, java-format msgid "" @@ -1723,5 +1785,5 @@ "редактирования.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1730,27 +1792,65 @@ "\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347 #, java-format msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" msgstr "Заголовок \"{0}\" не соответствуетожидаемой структуре \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396 #, java-format msgid "Uploading failed.
{0}" msgstr "Не удалось загрузить данные.
{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405 msgid "Upload to OSM API failed" msgstr "Ошибка выгрузки в OSM API" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 msgid "Updating primitive" msgstr "Обновление примитива" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 +msgid "Upload these changes?" +msgstr "Загрузить эти изменения?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Загрузить изменения" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, fuzzy, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Изменить новое отношение в слое ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:651 +msgid "Use a new changeset and close it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:652 +msgid "" +"Select to upload the data using a new changeset and to close the changeset " +"after the upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:655 +msgid "Use a new changeset and leave it open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +msgid "" +"Select to upload the data using a new changeset and to leave the changeset " +"open after the upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:658 +#, fuzzy +msgid "Upload to a new or to an existing changeset?" +msgstr "Добавить точку к линии" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 msgid "upload all changes in one request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 +msgstr "Выгрузить все изменения за один запрос" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1758,31 +1858,83 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Опишите изменения для закачиваемых данных:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Настройки карты" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 +#, fuzzy +msgid "Tags of new changeset" +msgstr "набор изменений" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Новые объекты:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Изменённые объекты:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 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/UploadAction.java:803 +#, fuzzy, java-format +msgid "{0} object to add:" +msgid_plural "{0} objects to add:" +msgstr[0] "Новые объекты:" +msgstr[1] "Новые объекты:" +msgstr[2] "Новые объекты:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:812 +#, fuzzy, java-format +msgid "{0} object to modifiy:" +msgid_plural "{0} objects to modify:" +msgstr[0] "Изменённые объекты:" +msgstr[1] "Изменённые объекты:" +msgstr[2] "Изменённые объекты:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:821 +#, fuzzy, java-format +msgid "{0} object to delete:" +msgid_plural "{0} objects to delete:" +msgstr[0] "Удаляемые объекты:" +msgstr[1] "Удаляемые объекты:" +msgstr[2] "Удаляемые объекты:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:910 +#, java-format +msgid "Use the existing changeset {0} and close it after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:911 +#, java-format +msgid "" +"Select to upload to the existing changeset {0} and to close the changeset " +"after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:914 +#, java-format +msgid "Use the existing changeset {0} and leave it open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:915 +#, java-format +msgid "" +"Select to upload to the existing changeset {0} and to leave the changeset " +"open for further uploads" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:942 +#, fuzzy, java-format +msgid "Tags of changeset {0}" +msgstr "Последние изменения: {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1806,20 +1958,20 @@ #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 #, java-format msgid "Audio: {0}" msgstr "Звук: {0}" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 msgid "Faster" msgstr "Быстрее" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Играть быстрее." @@ -1861,10 +2013,10 @@ msgstr "Воспроизвести предыдущий маркер" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 msgid "Slower" msgstr "Медленнее" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Играть медленнее." @@ -1892,31 +2044,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:119 msgid "No data imported." msgstr "Данные не импортированы" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 msgid "OpenStreetMap data" msgstr "Данные OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "Скачивание {0} из {1} ({2} осталось)" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 -msgid "Updating data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 #, java-format msgid "The following errors occurred during mass download:{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 msgid "Errors during Download" msgstr "Ошибка в течение загрузки" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1933,20 +2081,20 @@ "{2} что бы проигнорировать.
" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191 msgid "Deleted or moved primitives" msgstr "Удалённые или перемещённые примитивы" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 msgid "Delete Mode" msgstr "Режим удаления" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 msgid "Delete nodes or ways." msgstr "Удалить точки или линии." -#: ../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/DeleteAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -1955,5 +2103,5 @@ msgstr "Режим: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1964,55 +2112,69 @@ "точки." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 #: ../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/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537 -#: ../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/conflict/pair/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:51 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:287 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79 #: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #: ../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 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 #, java-format msgid "parameter ''{0}'' must not be null" msgstr "параметр ''{0}'' не должен быть null" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 msgid "Draw" msgstr "Рисовать" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Рисовать точки" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 msgid "Mode: Draw Focus" msgstr "Режим: Рисование фокуса" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 @@ -2020,38 +2182,38 @@ msgstr "выбранные" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:358 msgid "Cannot add a node outside of the world." msgstr "Точка не может быть добавлена за пределами мира." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Добавить точку" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:532 msgid "Add node into way" msgstr "Вставить точку в линию" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 msgid "Connect existing way to node" msgstr "Присоединить линию к точке" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542 msgid "Add a new node to an existing way" msgstr "Добавить точку к линии" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:544 msgid "Add node into way and connect" msgstr "Добавить точку к линии и объединить" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930 msgid "Create new node." msgstr "Создать новую точку" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 msgid "Select node under cursor." msgstr "Выбирете точко под курсором" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937 #, java-format msgid "Insert new node into way." @@ -2061,14 +2223,14 @@ msgstr[2] "Вставить новую точку в {0} линий" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947 msgid "Start new way from last node." msgstr "Начать путь с последней точки" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949 msgid "Continue way from last node." msgstr "Продолжить путь с последней точки" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972 msgid "Finish drawing." msgstr "Закончено вычерчивание" @@ -2088,5 +2250,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике." @@ -2097,5 +2259,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "Release the mouse button to stop rotating." msgstr "Отпустите кнопку мыши, чтобы прекратить вращение." @@ -2114,17 +2276,18 @@ "этой точке" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110 #: ../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:117 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:95 msgid "Select" msgstr "Выбор" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110 msgid "Select, move and rotate objects" msgstr "Выбирать, двигать и вращать объекты" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211 #, java-format msgid "Add and move a virtual new node to way" @@ -2134,13 +2297,21 @@ msgstr[2] "Добавьте или переместите новый виртуальный узел в {0} линиях" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Переместить элементы" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Move them" +msgstr "Переместить" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Undo move" +msgstr "Отмена перемещения" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#, fuzzy, java-format +msgid "" +"You moved more than {0} elements. Moving a large number of elements is often " +"an error.\n" "Really move them?" msgstr "" @@ -2148,13 +2319,9 @@ "часто является ошибкой. Действительно переместить?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Move them" -msgstr "Переместить" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Undo move" -msgstr "Отмена перемещения" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 +msgid "Always move and don't show dialog again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2163,5 +2330,5 @@ "объединения с ближайшей точкой." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2189,60 +2356,60 @@ "карту, нажав правую кнопку мыши, или 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/actions/search/SearchAction.java:43 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43 msgid "Search..." msgstr "Поиск..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search for objects." msgstr "Поиск объектов." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51 msgid "Can't search because there is no loaded data." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65 msgid "Please enter a search string." msgstr "Пожалуйста, введите строку для поиска." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "заменить выделение" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 msgid "add to selection" msgstr "добавить к выделению" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 msgid "remove from selection" msgstr "убрать из выделения" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "регистрозависимый" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "регулярное выражение" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 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 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 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 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' в любом месте названия." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - ключ 'type' с точным значением 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2252,50 +2419,51 @@ "b>, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - название не содержит 'Bak'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 msgid "foot: - key=foot set to any value." msgstr "foot: - key=foot устанавливает в любых значениях." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Special targets:" msgstr "Специальные цели:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "" "type: - type of the object (node, way, relation)" msgstr "type: - тип объекта (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "user:... - all objects changed by user" msgstr "user:... - все объекты, измененные заданным пользователем" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#, fuzzy +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:... - объект с заданным ID" + #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "modified - all changed objects" msgstr "modified - все измененные объекты" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "selected - all selected objects" msgstr "selected - все выбранные объекты" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "incomplete - all incomplete objects" msgstr "incomplete - все незаконченные объекты" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "untagged - all untagged objects" msgstr "без тэгов - все объекты без тэгов" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "" "child expr - all children of objects matching the expression" @@ -2304,5 +2472,5 @@ "выражению" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" "parent expr - all parents of objects matching the expression" @@ -2311,5 +2479,5 @@ "выражению" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "Use | or OR to combine with logical or" msgstr "" @@ -2317,5 +2485,5 @@ "«или»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2323,46 +2491,46 @@ "ключ содержит двоеточие)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Use ( and ) to group expressions" msgstr "Используйте ( и ) для группировки выражений" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Поиск" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Начать поиск" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 #, java-format msgid "No match found for ''{0}''" msgstr "Не найдено совпадений для ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Ничего не удалено из выделения в результате поиска ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208 #, java-format msgid "Found {0} matches" msgstr "Найдено {0} совпадений" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 msgid "RX" msgstr "RX" @@ -2431,58 +2599,96 @@ msgstr "Неверное значение id оператора: {0}. Ожидалось число." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Загрузить выделенное" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45 #, java-format msgid "Contact {0}..." msgstr "Связаться с {0}..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Загрузка..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:63 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:80 #, java-format msgid "Could not read from URL: \"{0}\"" msgstr "Ошибка соединения с адресом: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:83 #, java-format msgid "Parsing error in URL: \"{0}\"" msgstr "Ошибка разбора ссылки: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:87 msgid "Error while communicating with server." msgstr "Ошибка связи с сервером." -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65 -#, java-format -msgid "Add {0} {1}" +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 +#, fuzzy, java-format +msgid "Add node {0}" +msgstr "Добавить точку" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, fuzzy, java-format +msgid "Add way {0}" msgstr "Добавить {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 +#, fuzzy, java-format +msgid "Add relation {0}" +msgstr "Отношений: {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" msgstr "Изменить {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Изменить {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Изменить отношение" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "Удалить \"{0}\" для {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "Удалить \"{0}\" для {1} ''{2}''" + #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" +#, fuzzy, java-format +msgid "Remove \"{0}\" for relation ''{1}''" +msgstr "Удалить \"{0}\" для {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" 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 +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 +#, fuzzy, java-format +msgid "Set {0}={1} for way ''{2}''" +msgstr "Установить {0}={1} для {2} ''{3}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Установить {0}={1} для {2} ''{3}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:75 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 msgid "object" @@ -2492,10 +2698,10 @@ msgstr[2] "объектов" -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 #, java-format msgid "Remove \"{0}\" for {1} {2}" msgstr "Удалить \"{0}\" для {1} {2}" -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118 #, java-format msgid "Set {0}={1} for {2} {3}" @@ -2507,5 +2713,5 @@ msgstr "Изменить роль участника отношений для {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2514,10 +2720,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149 msgid "Double conflict" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +msgstr "Двойной конфликт" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2526,5 +2732,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 #, java-format msgid "Add conflict for ''{0}''" @@ -2548,44 +2754,64 @@ 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 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:127 +#, fuzzy, java-format +msgid "Delete {0} object" +msgid_plural "Delete {0} objects" +msgstr[0] "Удалить {0} {1}" +msgstr[1] "Удалить {0} {1}" +msgstr[2] "Удалить {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132 +#, fuzzy, java-format +msgid "Delete {0} node" +msgid_plural "Delete {0} nodes" +msgstr[0] "Режим удаления" +msgstr[1] "Режим удаления" +msgstr[2] "Режим удаления" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Удалить {0} {1}" +msgstr[1] "Удалить {0} {1}" +msgstr[2] "Удалить {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134 +#, fuzzy, java-format +msgid "Delete {0} relation" +msgid_plural "Delete {0} relations" +msgstr[0] "Удалить из связи" +msgstr[1] "Удалить из связи" +msgstr[2] "Удалить из связи" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 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?" +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +msgid "Delete from relation" +msgstr "Удалить из связи" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#, fuzzy, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\" with role {2}.
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:852 -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?" +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#, fuzzy, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" +"" msgstr "" "Выделенный объект \"{0}\" используется отношением \"{1}\".\n" "Удалить из отношения?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Разделить сегмент линии" @@ -2593,6 +2819,6 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:141 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -2604,7 +2830,7 @@ "использовать их.
Вы действительно хотите удалить их?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" -msgstr "" +msgstr "Удалить подтверждение" #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 @@ -2613,5 +2839,5 @@ msgstr "Разрешить конфликт при удалении {0}" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2648,10 +2874,20 @@ 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 +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 +#, java-format +msgid "Remove node ''{0}'' at position {1} from relation ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70 +#, java-format +msgid "Remove way ''{0}'' at position {1} from relation ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71 +#, java-format +msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141 #, java-format msgid "Rotate {0} node" @@ -2664,17 +2900,37 @@ msgstr "Последовательность" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in node {1}" msgstr "Устранить конфликты тега {0} в {1}{2}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in way {1}" +msgstr "Устранить конфликты тега {0} в {1}{2}" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Устранить конфликты тега {0} в {1}{2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, 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}" +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 +#, fuzzy, java-format +msgid "Resolve version conflicts for node {0}" +msgstr "Устранить конфликты версии для {0}{1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Устранить конфликты версии для {0}{1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" msgstr "Устранить конфликты версии для {0}{1}" @@ -2701,13 +2957,13 @@ "для поддержания целостности данных" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Отношение" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Старая роль" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Новая роль" @@ -2726,62 +2982,119 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 msgid "New value" msgstr "Новое значение" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Применить выбранные изменения" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Не применять изменения" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:85 msgid "Please select which property changes you want to apply." msgstr "Пожалуйста, выберите, какие параметры нужно изменить." -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Параметры " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:123 msgid "Roles in relations referring to" msgstr "Роли в отношениях, относящихся к" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144 msgid "Automatic tag correction" msgstr "Автоматически исправлять тэги" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263 +#, java-format +msgid "Warning: failed to persist preferences to ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368 #, 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}." +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377 +#, java-format +msgid "" +"Warning: Failed to initialize preferences. Preference directory ''{0}'' " +"isn't a directory." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380 +#, java-format +msgid "" +"Failed to initialize preferences.
Preference directory ''{0}'' " +"isn't a directory." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388 +#, java-format +msgid "" +"Warning: Failed to initialize preferences. Failed to create missing " +"preference directory: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391 +#, java-format +msgid "" +"Failed to initialize preferences.
Failed to create missing " +"preference directory: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#, java-format +msgid "" +"Warning: Missing preference file ''{0}''. Creating a default preference file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#, java-format +msgid "" +"Warning: Replacing existing preference file ''{0}'' with default preference " +"file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#, java-format +msgid "" +"Failed to initialize preferences.
Failed to reset preference file " +"to default: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#, fuzzy, java-format +msgid "" +"Preferences file had errors.
Making backup of old one to
{0}" +"
and creating a new default preference file." msgstr "Файл настроек поврежден. Восстанавливаем из старой копии в {0}." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 +#, java-format +msgid "" +"Warning: Failed to initialize preferences.Failed to reset preference file to " +"default: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87 #, java-format msgid "Preferences stored on {0}" msgstr "Параметры сохранены на {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Невозможно загрузить параметры. Причина: {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111 msgid "Could not load preferences from server." msgstr "Невозможно скачать параметры с сервера." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2795,29 +3108,36 @@ msgstr "уже существует конфликт для примитива ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +#. * +#. * the decimal format 999.999 +#. +#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" msgstr "Десятичные градусы" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32 +#. * +#. * the minutes/seconds format 99" 99' +#. +#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" msgstr "Градусы, минуты, секунды" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "Ю" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "С" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "З" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "E" msgstr "В" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:44 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #, java-format msgid "Changeset {0}" @@ -2829,15 +3149,232 @@ msgstr "параметр {0} должен быть > 0. Текущее значение {1}." -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186 -msgid "incomplete" -msgstr "неполный" - -#: ../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/OsmPrimitive.java:44 +#, java-format +msgid "Error: {0}" +msgstr "Ошибка: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Предупреждение: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +msgid "a primitive with id=0 can't be invisible" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26 +#, 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:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "параметр ''{0}'' - недопустимый класс, получен ''{1}''" + +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:571 +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:605 +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:623 +msgid "" +"tag collection can't be applied to a primitive because there are keys with " +"multiple values" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154 +msgid "There's no primitive with version {0} in this history" +msgstr "В этой истории не существует примитива версии {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161 +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163 +msgid "There's no version valid at date ''{0}'' in this history" +msgstr "Нет версии действительной для даты \"{0}\" в этой истории" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "параметр ''{0}'' должен быть в интервале 0..{1}, текущее значение {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180 +msgid "no earliest version found. History is empty." +msgstr "более ранняя версия не найдена. История пуста." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186 +msgid "no latest version found. History is empty." +msgstr "более поздняя версия не найдена. История пуста." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +msgid "Didn't find an primitive with id {0} in this dataset" +msgstr "Примитив с id {0} не был найден в этом наборе данных" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:84 +msgid "Didn't find an primitive with id {0} and version {1} in this dataset" +msgstr "Примитив с id {0} и версией {1} не был найден в этом наборе данных" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34 +#, java-format +msgid "parameter ''{0}'' > 0 expected, got ''{1}''" +msgstr "параметр ''{0}'' должен быть > 0, текущее значение ''{1}''" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104 +msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''" +msgstr "невозможно сравнить примитив с id ''{0}'' и примитив с id ''{1}''" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48 +#, java-format +msgid "parameter {0} not in range 0..{1}, got {2}" +msgstr "параметр {0} не в интервале 0..{1}, текущее значение {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +msgid "Area style way is not closed." +msgstr "Путь, обозначающий границу области, не закрыт." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477 +#, java-format +msgid "multipolygon way ''{0}'' is not closed." +msgstr "многополигональная линия ''{0}'' не замкнута" + +#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed +#. TODO Remove useless nullcheck when RelationMember.member is encalupsed +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:835 +msgid "Empty member in relation." +msgstr "В отношении имеется пустой член." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:837 +#, java-format +msgid "Deleted member ''{0}'' in relation." +msgstr "В отношении «{0}» имеется член, который был удален." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:848 +#, java-format +msgid "Way ''{0}'' with less than two points." +msgstr "Путь «{0}» имеет меньше двух точек." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +msgid "More than one \"from\" way found." +msgstr "Найден больше чем один \"from\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +msgid "More than one \"to\" way found." +msgstr "Найден больше чем один \"to\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625 +msgid "More than one \"via\" found." +msgstr "Найден больше чем один \"via\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#, java-format +msgid "Unknown role ''{0}''." +msgstr "Неизвестная роль «{0}»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "Неизвестный тип членства для «{0}»." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +msgid "No \"from\" way found." +msgstr "Не найден путь \"from\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "Не найден путь \"to\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +msgid "No \"via\" node or way found." +msgstr "Не найдена \"via\" точка или путь" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:656 +msgid "The \"from\" way doesn't start or end at a \"via\" node." +msgstr "\"from\" путь не начинается или заканчивается на \"via\" точке." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:660 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "\"to\" путь не начинается или заканчивается на \"via\" точке." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:673 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "\"from\" путь не начинается или заканчивается на \"via\" пути." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:677 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "\"to\" путь не начинается или заканчивается на \"via\" пути." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "Стиль для ограничения {0} не найден." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#, java-format +msgid "No useful role ''{0}'' for Way ''{1}''." +msgstr "Нет полезного значения ''{0}'' для пути ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#, java-format +msgid "Non-Way ''{0}'' in multipolygon." +msgstr "не-линия ''{0}'' в мультиполигональном отношении" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#, java-format +msgid "No outer way for multipolygon ''{0}''." +msgstr "Для мультиполигона «{0}» отсутствует внешний путь." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "Перекрёсток между линиями ''{0}'' и ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "Внутренний путь «{0}» находится снаружи." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "Стиль для внутренней ''{0}''одинаков с мультиполигоном." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "Стиль для внешней границы ''{0}'' отсутствует." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +msgid "untagged" +msgstr "без тэга" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "текст" + +#. should not happen +#. +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242 +#, java-format +msgid "" +"My primitive with id {0} and version {1} is visible although their primitive " +"with lower version {2} is not visible. Can't deal with this inconsistency. " +"Keeping my primitive. " +msgstr "" +"Мой примитив с id {0} и версией {1} видим, хотя их примитив с более низкой " +"версией {2} невидим. Не могут справиться с этой непоследовательности. " +"Сохраняю мой примитив. " + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "неактивный" + #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -2847,22 +3384,7 @@ msgstr[2] "узлов" -#: ../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:43 -#, java-format -msgid "Warning: {0}" -msgstr "Предупреждение: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -msgid "nodes" -msgstr "точки" - -#: ../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:241 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -2872,12 +3394,7 @@ msgstr[2] "линий" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -msgid "ways" -msgstr "линии" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -2887,27 +3404,134 @@ msgstr[2] "отношений" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -msgid "relations" -msgstr "отношения" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changeset" -msgstr "набор изменений" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changesets" -msgstr "наборы изменений" - -#: ../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:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "параметр ''{0}'' - недопустимый класс, получен ''{1}''" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +msgid "untagged way" +msgstr "линия без тэгов" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +msgid "incomplete way" +msgstr "незаконченная линия" + +#: ../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:167 +msgid "background" +msgstr "фон" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 +msgid "highlight" +msgstr "подсветка" + +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 +msgid "WGS84 Geographic" +msgstr "Географическая WGS84" + +#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215 +msgid "Gauss-Laborde Réunion 1947" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 +msgid "" +"IMPORTANT : data positioned far away from\n" +"the current Lambert zone limits.\n" +"Do not upload any data after this message.\n" +"Undo your last action, save your work\n" +"and start a new layer on the new zone." +msgstr "" +"ВАЖНО : данных расположены слишком далеко от\n" +"текущих границ Lambert зоны.\n" +"Не загружайте никаких данны после этого сообщения.\n" +"Отмените ваше последнее действие, сохраните вашу работу\n" +"и начните новый слой в новой зоне." + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +msgid "Lambert Zone (France)" +msgstr "Зоны Ламберта (Франция)" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 +msgid "Lambert Zone (Estonia)" +msgstr "Lambert Зона (Эстония)" + +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 +msgid "Mercator" +msgstr "Проекция Меркатора" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +msgid "Swiss Grid (Switzerland)" +msgstr "Швейцарская проекция" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 +#, java-format +msgid "UTM Zone {0}" +msgstr "UTM Зона {0}" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 +msgid "UTM20N Guadeloupe Fort-Marigot 1949" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 +msgid "UTM20N Guadeloupe Ste-Anne 1948" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 +msgid "UTM20N Martinique Fort Desaix 1952" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "Невозможно прочесть файл: ''{0}''. Ошибка в:
{1}" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 +#, java-format +msgid "Could not write bookmark.
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 +msgid "Do not show again" +msgstr "Больше не показывать" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 +#: ../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/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 +msgid "incomplete" +msgstr "неполный" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "дорога" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "железная дорога" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "водоёмы" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "землепользование" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 +#, java-format +msgid "{0} node" +msgid_plural "{0} nodes" +msgstr[0] "{0} точка" +msgstr[1] "{0} точки" +msgstr[2] "{0} точек" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 #, java-format msgid "{0} member" @@ -2917,318 +3541,52 @@ msgstr[2] "{0} участников" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "дорога" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "железная дорога" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "водоёмы" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "землепользование" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 -#, java-format -msgid "{0} node" -msgid_plural "{0} nodes" -msgstr[0] "{0} точка" -msgstr[1] "{0} точки" -msgstr[2] "{0} точек" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "В этой истории не существует примитива версии {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:160 -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:162 -msgid "There's no version valid at date ''{0}'' in this history" -msgstr "Нет версии действительной для даты \"{0}\" в этой истории" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "параметр ''{0}'' должен быть в интервале 0..{1}, текущее значение {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179 -msgid "no earliest version found. History is empty." -msgstr "более ранняя версия не найдена. История пуста." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185 -msgid "no latest version found. History is empty." -msgstr "более поздняя версия не найдена. История пуста." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30 -msgid "Didn't find an primitive with id {0} in this dataset" -msgstr "Примитив с id {0} не был найден в этом наборе данных" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36 -msgid "Didn't find an primitive with id {0} and version {1} in this dataset" -msgstr "Примитив с id {0} и версией {1} не был найден в этом наборе данных" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33 -#, java-format -msgid "parameter ''{0}'' > 0 expected, got ''{1}''" -msgstr "параметр ''{0}'' должен быть > 0, текущее значение ''{1}''" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104 -msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''" -msgstr "невозможно сравнить примитив с id ''{0}'' и примитив с id ''{1}''" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48 -#, java-format -msgid "parameter {0} not in range 0..{1}, got {2}" -msgstr "параметр {0} не в интервале 0..{1}, текущее значение {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 -msgid "Area style way is not closed." -msgstr "Путь, обозначающий границу области, не закрыт." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438 -#, java-format -msgid "multipolygon way ''{0}'' is not closed." -msgstr "многополигональная линия ''{0}'' не замкнута" - -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787 -msgid "Empty member in relation." -msgstr "В отношении имеется пустой член." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 -#, java-format -msgid "Deleted member ''{0}'' in relation." -msgstr "В отношении «{0}» имеется член, который был удален." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 -#, java-format -msgid "Way ''{0}'' with less than two points." -msgstr "Путь «{0}» имеет меньше двух точек." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -msgid "More than one \"from\" way found." -msgstr "Найден больше чем один \"from\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565 -msgid "More than one \"to\" way found." -msgstr "Найден больше чем один \"to\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 -msgid "More than one \"via\" found." -msgstr "Найден больше чем один \"via\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 -#, java-format -msgid "Unknown role ''{0}''." -msgstr "Неизвестная роль «{0}»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "Неизвестный тип членства для «{0}»." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 -msgid "No \"from\" way found." -msgstr "Не найден путь \"from\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "Не найден путь \"to\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -msgid "No \"via\" node or way found." -msgstr "Не найдена \"via\" точка или путь" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614 -msgid "The \"from\" way doesn't start or end at a \"via\" node." -msgstr "\"from\" путь не начинается или заканчивается на \"via\" точке." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618 -msgid "The \"to\" way doesn't start or end at a \"via\" node." -msgstr "\"to\" путь не начинается или заканчивается на \"via\" точке." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 -msgid "The \"from\" way doesn't start or end at the \"via\" way." -msgstr "\"from\" путь не начинается или заканчивается на \"via\" пути." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634 -msgid "The \"to\" way doesn't start or end at the \"via\" way." -msgstr "\"to\" путь не начинается или заканчивается на \"via\" пути." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "Стиль для ограничения {0} не найден." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "Нет полезного значения ''{0}'' для пути ''{1}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 -#, java-format -msgid "Non-Way ''{0}'' in multipolygon." -msgstr "не-линия ''{0}'' в мультиполигональном отношении" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 -#, java-format -msgid "No outer way for multipolygon ''{0}''." -msgstr "Для мультиполигона «{0}» отсутствует внешний путь." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 -#, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "Перекрёсток между линиями ''{0}'' и ''{1}''." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "Внутренний путь «{0}» находится снаружи." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "Стиль для внутренней ''{0}''одинаков с мультиполигоном." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "Стиль для внешней границы ''{0}'' отсутствует." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 -msgid "untagged" -msgstr "без тэга" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "текст" - -#. should not happen -#. -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242 -#, java-format -msgid "" -"My primitive with id {0} and version {1} is visible although their primitive " -"with lower version {2} is not visible. Can't deal with this inconsistency. " -"Keeping my primitive. " -msgstr "" -"Мой примитив с id {0} и версией {1} видим, хотя их примитив с более низкой " -"версией {2} невидим. Не могут справиться с этой непоследовательности. " -"Сохраняю мой примитив. " - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "неактивный" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -msgid "untagged way" -msgstr "линия без тэгов" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 -msgid "incomplete way" -msgstr "незаконченная линия" - -#: ../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:160 -msgid "background" -msgstr "фон" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -msgid "highlight" -msgstr "подсветка" - -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographic" -msgstr "Географическая WGS84" - -#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215 -msgid "Gauss-Laborde Réunion 1947" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" -"ВАЖНО : данных расположены слишком далеко от\n" -"текущих границ Lambert зоны.\n" -"Не загружайте никаких данны после этого сообщения.\n" -"Отмените ваше последнее действие, сохраните вашу работу\n" -"и начните новый слой в новой зоне." - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 -msgid "Lambert Zone (France)" -msgstr "Зоны Ламберта (Франция)" - -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 -msgid "Lambert Zone (Estonia)" -msgstr "Lambert Зона (Эстония)" - -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 -msgid "Mercator" -msgstr "Проекция Меркатора" - -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 -msgid "Swiss Grid (Switzerland)" -msgstr "Швейцарская проекция" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 -#, java-format -msgid "UTM Zone {0}" -msgstr "UTM Зона {0}" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 -#, java-format -msgid "Could not read bookmarks.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 -#, java-format -msgid "Could not write bookmark.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -msgid "Do not show again" -msgstr "Больше не показывать" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41 -#, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 +#, fuzzy, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.
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:60 +#. item "Ways/Cycleway" combo "Pedestrians" +#. item "Ways/Footway" combo "Bikes" +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:58 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:228 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 +#: 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:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:449 +#: build/trans_presets.java:469 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_presets.java:773 +#: build/trans_presets.java:788 build/trans_presets.java:1330 +#: build/trans_presets.java:1397 build/trans_presets.java:1398 +#: build/trans_presets.java:1399 build/trans_presets.java:2439 +#: build/trans_presets.java:2440 build/trans_presets.java:2441 +msgid "unknown" +msgstr "неизвестный" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61 +#, java-format +msgid "" +"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " +"changeset will automatically be closed by the server after a timeout." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81 #, java-format msgid "" @@ -3241,36 +3599,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 msgid "Precondition violation" msgstr "Нарушение предварительного условия" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102 -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183 -#: ../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 -#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 -#: 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:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_presets.java:768 -#: build/trans_presets.java:783 build/trans_presets.java:1325 -#: build/trans_presets.java:1387 -msgid "unknown" -msgstr "неизвестный" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3280,9 +3611,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139 msgid "Security exception" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:154 #, java-format msgid "" @@ -3290,10 +3621,12 @@ "check your internet connection." msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +"Невозможно установить соединение с удаленным сервером
''{0}''." +"
Пожалуйста проверьте свое подключение к интернету." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 msgid "Network exception" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:179 #, java-format msgid "" @@ -3302,9 +3635,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:189 msgid "IO Exception" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:203 +#, java-format +msgid "" +"The OSM server
''{0}''
reported an internal server error." +"
This is most likely a temporary problem. Please try again later." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:213 +msgid "Internal Server Error" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:235 #, java-format msgid "" @@ -3314,9 +3658,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Неизвестный хост" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3329,12 +3673,7 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 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 @@ -3351,38 +3690,38 @@ msgstr "Загружается \"Сообщение дня\"" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Параметры загрузки" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 msgid "Upload the current preferences to the server" msgstr "Загрузить текущие параметры на сервер" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "строка" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Имя пользователя" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "Пароль OSM" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "Изменить размер апплета на заданный (формат: ШИРИНАxВЫСОТА)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "строка;строка;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3392,5 +3731,5 @@ "lat=y&lon=x&zoom=z, либо название файла" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3400,5 +3739,5 @@ "URL, содержащая lat=y&lon=x&zoom=z, либо название файла" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3408,75 +3747,94 @@ "ссылкой, которая возвращает osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "любое" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "If specified, reset the configuration instead of reading it." msgstr "Если выбрано - установить настройки по умолчанию." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162 msgid "Username" msgstr "Имя пользователя" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 msgid "Password" msgstr "Пароль" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "использование" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "опции" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Показать эту справку" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "Стандартный параметр геометрии unix" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box" msgstr "Скачать область в пределах рамки" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 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:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Open file (as raw gps, if .gpx)" msgstr "Открыть файл (как данные GPS, если .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Download the bounding box as raw gps" msgstr "Скачать область в пределах рамки, как данные GPS" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Select with the given search" msgstr "Выбор с учетом поиска" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "Launch in maximized mode" msgstr "Запуск в развернутом виде" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 msgid "Reset the preferences to default" msgstr "Восстановить параметры по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Установить язык." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +msgid "options provided as Java system properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +msgid "/PATH/TO/JOSM/FOLDER/ " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +msgid "Change the folder for all user settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +msgid "" +"note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " +"the following\n" +" Java option to increase the maximum size of allocated memory" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "examples" msgstr "примеры" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3486,25 +3844,25 @@ "убедитесь, что загружаете данные перед --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "Instead of --download= you may specify osm://\n" msgstr "Вместо --download= можно указать osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 msgid "Activating updated plugins" msgstr "Включение обновлённых модулей" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Загрузка ранних модулей" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Настройки по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Загрузка модулей" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:185 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -3513,22 +3871,22 @@ "используется." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Файл" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Вид" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Инструменты" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Шаблоны" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 @@ -3540,21 +3898,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:234 msgid "Wireframe View" msgstr "Каркас" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Показать/скрыть каркас" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Полноэкранный режим" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Переключить в Полноэкранный режим" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Аудио" @@ -3594,59 +3952,45 @@ msgstr "Уменьшить масштаб" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "масштаб" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93 msgid "The geographic longitude at the mouse pointer." msgstr "Географическая долгота положения курсора" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The name of the object at the mouse pointer." msgstr "Название объекта, на который наведён курсор" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The geographic latitude at the mouse pointer." msgstr "Географическая широта положения курсора" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The angle between the previous and the current way segment." msgstr "Угол между предыдущим и текущим сегментом линии" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The (compass) heading of the line segment being drawn." msgstr "Путевой угол создаваемого сегмента" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The length of the new way segment being drawn." msgstr "Длина создаваемого сегмента линии" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(нет объекта)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301 msgid "layer not in list." msgstr "слоя нет в списке." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488 #, java-format msgid "Layer ''{0}'' must be in list of layers" msgstr "Слой ''{0}'' должен быть в списке слоёв" - -#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:265 -#, 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 @@ -3657,10 +4001,4 @@ 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 @@ -3719,7 +4057,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" @@ -3735,5 +4072,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3841,5 +4178,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Моя версия" @@ -3850,5 +4187,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 msgid "Merged version" @@ -3864,5 +4201,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Их версия" @@ -3947,6 +4284,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -4064,10 +4401,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182 #, java-format msgid "unexpected column index. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 #, java-format msgid "" @@ -4078,19 +4415,19 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 msgid "Communication with server failed" msgstr "Связь с сервером прервана" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "Да, восстановить их тоже" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "Нет, отменить действие" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 #, java-format msgid "" @@ -4102,5 +4439,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 msgid "Undelete additional nodes?" msgstr "Восстановить дополнительные узлы?" @@ -4121,9 +4458,9 @@ msgstr "Восстановить связанные примитивы?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:79 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Свойства в моём наборе данных, то есть локальном наборе данных" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 msgid "" "Properties in the merged element. They will replace properties in my " @@ -4131,95 +4468,97 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Свойства в их наборе данных, то есть серверном наборе данных" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:107 msgid "Coordinates:" msgstr "Координаты:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 msgid "Deleted State:" msgstr "Удалён:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Visible State:" msgstr "Видим:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(отсутствует)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:50 msgid "deleted" msgstr "удалён" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 msgid "not deleted" msgstr "не удалён" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "visible (on the server)" msgstr "видим (на сервере)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 msgid "not visible (on the server)" msgstr "невидим (на сервере)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 msgid "Keep a clone of the local version" msgstr "Оставить клон локальной версии" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" msgstr "Физически удалить из локального набора данных" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 msgid "Keep my coordiates" msgstr "Оставить мои координаты" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 msgid "Keep their coordiates" msgstr "Оставить их координаты" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 msgid "Undecide conflict between different coordinates" msgstr "Восстановить конфликт между различными координатами" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 msgid "Keep my deleted state" msgstr "Оставить моё состояние \"Удалён\"" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 msgid "Keep their deleted state" msgstr "Оставить их состояние \"Удалён\"" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 msgid "Undecide conflict between deleted state" msgstr "Восстановить конфликт между состояниями \"Удалён\"" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 msgid "Keep my visible state" msgstr "Оставить моё состояние \"Видим\"" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 msgid "Yes, reset the id" msgstr "Да, сбросить id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 msgid "No, abort" msgstr "Нет, прервать" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of {0} {1} to " -"0.
On the next upload the server will assign
it a new id.
Do yo " -"agree?" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#, fuzzy, java-format +msgid "" +"To keep your local version, JOSM
has to reset the id of primitive " +"{0} to 0.
On the next upload the server will assign
it a new id.
Do " +"yo agree?" msgstr "" "Что бы оставить вашу локальную версию, JOSM
должен сбросить " @@ -4227,17 +4566,17 @@ "присвоит
новое значение id.
Вы согласны?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 msgid "Reset id to 0" msgstr "Сбросить в 0" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Keep their visible state" msgstr "Оставить их состояние \"Видим\"" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Yes, purge it" msgstr "Да, очистить" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 #, java-format msgid "" @@ -4248,21 +4587,21 @@ "данных.
Вы согласны?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 msgid "Remove from dataset" msgstr "Удалить из набора данных" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 msgid "Undecide conflict between visible state" msgstr "Восстановить конфликт между состояниями \"Видим\"" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 msgid "Role" msgstr "Роль" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "Примитив" @@ -4301,10 +4640,11 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 #: ../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 @@ -4313,10 +4653,11 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../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:76 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4330,5 +4671,5 @@ #. should not happen, but just in case -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39 #, java-format msgid "Parameter 'col' must be 0 or 1. Got {0}" @@ -4369,4 +4710,144 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "Их набор данных не содержит тег с ключом {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 +msgid "none" +msgstr "ничего" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: build/trans_presets.java:2272 +msgid "all" +msgstr "все" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Выбор цвета" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:43 +msgid "Please decided which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:47 +#, fuzzy, java-format +msgid "Value ''{0}'' is going to be applied for key ''{1}''" +msgstr "параметр ''{0}'' - имя недопустимого типа, получен ''{1}''" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#, java-format +msgid "The key ''{0}'' and all it's values are going to be removed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:56 +#, java-format +msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 +#, fuzzy, java-format +msgid "parameter ''{0}'' must not be empty" +msgstr "параметр ''{0}'' не должен быть null" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 +#, fuzzy, java-format +msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" +msgstr "параметр ''{0}'' должен быть в интервале 0..{1}, текущее значение {2}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 +msgid "tag collection doesn't include the selected value ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 +#, fuzzy +msgid "not yet decided" +msgstr "не удалён" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:289 +#, fuzzy +msgid "Not decided yet" +msgstr "Ещё не реализовано." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 +msgid "Tags from nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 +#, fuzzy +msgid "Tags from ways" +msgstr "с улицы" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Удалить из связи" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "Конфликт в данных" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 +#, java-format +msgid "{0} way" +msgid_plural "{0} ways" +msgstr[0] "{0} линия" +msgstr[1] "{0} линии" +msgstr[2] "{0} линий" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 +#, java-format +msgid "{0} relation" +msgid_plural "{0} relations" +msgstr[0] "{0} отношение" +msgstr[1] "{0} отношения" +msgstr[2] "{0} отношений" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Разрешение конфликтов" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Устранить конфликт" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 +msgid "Apply" +msgstr "Применить" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380 +#, fuzzy +msgid "Paste ..." +msgstr "Вставить" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380 +msgid "From ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380 +msgid "To ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428 +#, fuzzy, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "{0} линия" +msgstr[1] "{0} линии" +msgstr[2] "{0} линий" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4382,10 +4863,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 #: ../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:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -4393,5 +4874,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:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #, java-format msgid "Toggle: {0}" @@ -4422,36 +4903,30 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 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:141 -msgid "" -"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " -"Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:162 msgid "Cancel conflict resolution and close the dialog" msgstr "Отменить устранение конфликтов и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:180 msgid "Apply resolved conflicts and close the dialog" msgstr "Применить устранение конфликтов и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:181 msgid "Apply Resolution" msgstr "Применить решение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 msgid "Close anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194 msgid "Continue resolving" msgstr "Продолжить решение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196 #, java-format msgid "" @@ -4463,152 +4938,118 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 msgid "Resolve conflicts" msgstr "Устранить конфликт" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:243 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 msgid "History" msgstr "Журнал" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 msgid "Display the history of all selected items." msgstr "Отобразить журнал по всем выделенным объектам." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" -"Загрузка истории с сервера потерпела неудачу. Подробности:
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239 #, java-format msgid "index out of bounds Got {0}" msgstr "Индекс вне допустимых пределов. Текущее значение {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#, java-format +msgid "Node {0}" +msgstr "Узел {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +#, fuzzy, java-format +msgid "Way {0}" +msgstr "Слой: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#, fuzzy, java-format +msgid "Relation {0}" +msgstr "Отношений: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 msgid "History item" msgstr "Пункт истории" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 -msgid "Load history" -msgstr "Загрузить историю" - -#: ../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:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317 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:474 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341 msgid "Show" msgstr "Показать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342 msgid "Display the history of the selected primitive" msgstr "Показать историю выделенного примитива" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149 msgid "Layers" msgstr "Слои" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148 msgid "Open a list of all loaded layers." msgstr "Показать список всех загруженных слоёв." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297 msgid "Delete the selected layer." msgstr "Удалить выбранный слой." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304 -#, 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:305 -msgid "Delete Layer" -msgstr "Удалить слой" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332 -#, java-format -msgid "Do you really want to delete layer ''{0}''?" -msgstr "Вы действительно хотите удалить слой ''{0}''?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132 -msgid "Confirmation" -msgstr "Подтверждение" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324 -msgid "Yes" -msgstr "Да" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325 -msgid "No" -msgstr "Нет" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326 -msgid "Delete all" -msgstr "Удалить всё" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333 -#, java-format -msgid "Deleting layer {0} of {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367 msgid "Show/Hide" msgstr "Показать/скрыть" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378 msgid "Toggle visible state of the selected layer." msgstr "Показать/скрыть выбранный слой" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581 msgid "Move the selected layer one row up." msgstr "Переместить выделенный слой вверх." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600 msgid "Move the selected layer one row down." msgstr "Переместить выделенный слой вниз." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33 msgid "Information about layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4618,28 +5059,22 @@ msgstr[2] "Это изменит до {0} объектов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 msgid "An empty value deletes the key." msgstr "Пустое значение удаляет ключ." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:112 msgid "" msgstr "<различные>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Изменить значения?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#, 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:273 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4649,89 +5084,84 @@ msgstr[2] "Изменить параметры {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../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:344 +#: ../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:360 -#, java-format -msgid "Warning: failed to put dialog always on top. Exception was: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 msgid "Please select the objects you want to change properties for." msgstr "Выберите объекты, для которых вы желаете изменить параметры." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Параметры/отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 msgid "Properties for selected objects." msgstr "Параметры выделенных объектов." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 msgid "Member Of" msgstr "Член группы" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Добавить параметры" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 #: ../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:619 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:65 msgid "Add" msgstr "Добавить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 msgid "Add a new key/value pair to all objects" msgstr "Добавить новую пару ключ/значение для всех объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Изменить параметры" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 msgid "Edit the value of the selected key for all objects" msgstr "Изменить значение выбранного ключа для всех объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Свойств: {0} / Входит в отношения: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 msgid "Properties / Memberships" msgstr "Параметры / отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Изменить отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Удалить выделение из отношения {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 msgid "Delete the selected key in all objects" msgstr "Удалить выбранный ключ из всех объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Удалить параметры" @@ -4740,34 +5170,34 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148 -#: build/trans_presets.java:2978 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146 +#: build/trans_presets.java:3106 msgid "Relations" msgstr "Отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 msgid "Open a list of all relations." msgstr "Показать список всех отношений." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144 #, java-format msgid "Relations: {0}" msgstr "Отношений: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 msgid "Open an editor for the selected relation" msgstr "Открыть редактор для выбранного отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 msgid "Delete the selected relation" msgstr "Удалить выбранное отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336 msgid "Create a new relation" msgstr "Создать новое отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412 msgid "Create a copy of this relation and open it in another editor window" msgstr "Создать копию этих отношений и открыть их в другом окне" @@ -4800,25 +5230,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "выделение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} линия" -msgstr[1] "{0} линии" -msgstr[2] "{0} линий" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} отношение" -msgstr[1] "{0} отношения" -msgstr[2] "{0} отношений" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4826,14 +5240,9 @@ msgstr "Выбор: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434 msgid "Undock the panel" msgstr "Отсоединить панель" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4842,64 +5251,100 @@ "панели." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457 msgid "Click to minimize/maximize the panel content" msgstr "Щёлкните для уменьшения/увеличения содержимого панели" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 msgid "Authors" msgstr "Авторы" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 msgid "Open a list of people working on the selected objects." msgstr "Показать список людей, работающих с выделенными объектами." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 +#, fuzzy, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "Автор" +msgstr[1] "Автор" +msgstr[2] "Автор" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 +#, fuzzy +msgid "Show info" +msgstr "Показать" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 +#, fuzzy +msgid "Launches a browser with information about the user" +msgstr "Подробнее" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 +#, fuzzy, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" +"ПРЕДУПРЕЖДЕНИЕ: запуск окон браузера только для первых {0} из {1} выделенных " +"примитивов" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 +msgid "Missing encoding" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "Author" msgstr "Автор" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "кол-во объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Авторы: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435 msgid "Edit the relation the currently selected relation member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221 msgid "Download all child relations (recursively)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:223 msgid "Download All Children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242 msgid "Download selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:246 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:1533 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502 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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 msgid "Conflicts in data" msgstr "Конфликт в данных" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:343 #, java-format msgid "" @@ -4908,47 +5353,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:352 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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 #, java-format msgid "Downloading relation {0}" msgstr "" -#: ../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:1597 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166 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:611 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581 msgid "Role:" msgstr "Роль:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 msgid "" "There is at least one member in this relation referring
to the " @@ -4957,14 +5396,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680 #, java-format msgid "" @@ -4974,9 +5413,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 #, java-format msgid "" @@ -4986,5 +5425,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -4993,5 +5432,5 @@ "членом" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -5000,5 +5439,5 @@ "члена" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5008,5 +5447,5 @@ "выделенным членом" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5016,20 +5455,20 @@ "выделенного члена" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869 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:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Relation Editor: Remove Selected" msgstr "Редактор зависимостей: удалить выбранные" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 #, java-format msgid "" @@ -5038,57 +5477,57 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Relation Editor: Sort" msgstr "Редактор зависимостей: сортировать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 msgid "Move the currently selected members up" msgstr "Переместить выбранных членов отношения вверх" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979 msgid "Relation Editor: Move Up" msgstr "Редактор зависимостей: поднять" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995 msgid "Move the currently selected members down" msgstr "Переместить выбранных членов отношения вниз" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998 msgid "Relation Editor: Move Down" msgstr "Редактор зависимостей: опустить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017 msgid "Relation Editor: Remove" msgstr "Редактор зависимостей: удалить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5097,9 +5536,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143 #, java-format msgid "" @@ -5108,20 +5547,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 msgid "Apply the current updates" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190 -msgid "Apply" -msgstr "Применить" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 msgid "Apply the updates and close the dialog" msgstr "Применить обновления и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237 +#: ../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 @@ -5131,37 +5566,37 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Cancel the updates and close the dialog" msgstr "Отменить обновления и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241 msgid "Add an empty tag" msgstr "Добавить пустой тег" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 msgid "Delete the currently selected tags" msgstr "Удалить выделенные теги" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 msgid "Download all incomplete ways and nodes in relation" msgstr "Скачать недостающие части линий и узлов, участвующих в отношении" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 msgid "Download Members" msgstr "Скачать участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 msgid "Relation Editor: Download Members" msgstr "Редактор зависимостей: скачать членов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340 msgid "Sets a role for the selected members" msgstr "Задать роль для выбранных членов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Apply Role" msgstr "Применить роль" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356 #, java-format msgid "" @@ -5171,30 +5606,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223 msgid "Zoom to primitive the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -5208,22 +5643,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 msgid "Download referring relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81 #, java-format msgid "child.id >0 expected. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63 msgid "including immediate children of parent relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 msgid "Load parent relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 +#, fuzzy +msgid "Loading parent relations" +msgstr "Редактировать отношения" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "Изменить выбранное отношение" @@ -5256,35 +5696,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 -msgid "" -msgstr "<множественный>" - -#: ../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 -msgid "Remove old keys from up to {0} object" -msgid_plural "Remove old keys from up to {0} objects" -msgstr[0] "Удалить старые ключи из {0} объекта" -msgstr[1] "Удалить старые ключи из {0} объектов" -msgstr[2] "Удалить старые ключи из {0} объектов" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Закладки" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82 msgid "Please enter the desired coordinates first." msgstr "Пожалуйста, введите сначала желаемые координаты" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89 msgid "Please enter a name for the location." msgstr "Пожалуйста, введите название места." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107 msgid "Select a bookmark first." msgstr "Сначала выберите закладку." @@ -5342,13 +5768,13 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118 msgid "Null pointer exception, possibly some missing tags." msgstr "Нулевой исключение, возможно есть отсутствующие тэги" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 msgid "Please enter a search string" msgstr "Задайте строку для поиска" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192 msgid "Cannot read place search results from server" msgstr "Не удается получить результаты поиска" @@ -5356,18 +5782,17 @@ #. 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:217 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214 msgid "Enter a place name to search for:" msgstr "Название места для поиска:" -#. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 -#: build/trans_presets.java:2623 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 +#: build/trans_presets.java:2744 msgid "Places" msgstr "Места" #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 msgid "name" msgstr "название" @@ -5406,37 +5831,37 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 -#: build/trans_presets.java:1856 build/trans_presets.java:1862 -#: build/trans_presets.java:1868 build/trans_presets.java:1874 -#: build/trans_presets.java:1880 build/trans_presets.java:1886 -#: build/trans_presets.java:1892 build/trans_presets.java:1898 -#: build/trans_presets.java:1904 build/trans_presets.java:1910 -#: build/trans_presets.java:1916 build/trans_presets.java:1922 -#: build/trans_presets.java:1928 build/trans_presets.java:1934 -#: build/trans_presets.java:1940 build/trans_presets.java:1949 -#: build/trans_presets.java:1956 build/trans_presets.java:1964 -#: build/trans_presets.java:1970 build/trans_presets.java:1976 -#: build/trans_presets.java:1982 build/trans_presets.java:1988 -#: build/trans_presets.java:1994 build/trans_presets.java:2000 -#: build/trans_presets.java:2006 build/trans_presets.java:2012 -#: build/trans_presets.java:2018 build/trans_presets.java:2024 -#: build/trans_presets.java:2030 build/trans_presets.java:2036 -#: build/trans_presets.java:2042 build/trans_presets.java:2048 -#: build/trans_presets.java:2054 build/trans_presets.java:2060 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250 +#: build/trans_presets.java:1923 build/trans_presets.java:1929 +#: build/trans_presets.java:1935 build/trans_presets.java:1941 +#: build/trans_presets.java:1947 build/trans_presets.java:1953 +#: build/trans_presets.java:1959 build/trans_presets.java:1965 +#: build/trans_presets.java:1971 build/trans_presets.java:1977 +#: build/trans_presets.java:1983 build/trans_presets.java:1989 +#: build/trans_presets.java:1995 build/trans_presets.java:2001 +#: build/trans_presets.java:2007 build/trans_presets.java:2016 +#: build/trans_presets.java:2023 build/trans_presets.java:2031 +#: build/trans_presets.java:2037 build/trans_presets.java:2043 +#: build/trans_presets.java:2049 build/trans_presets.java:2055 +#: build/trans_presets.java:2061 build/trans_presets.java:2067 +#: build/trans_presets.java:2073 build/trans_presets.java:2079 +#: build/trans_presets.java:2085 build/trans_presets.java:2091 +#: build/trans_presets.java:2097 build/trans_presets.java:2103 +#: build/trans_presets.java:2109 build/trans_presets.java:2115 +#: build/trans_presets.java:2121 build/trans_presets.java:2127 msgid "type" msgstr "тип" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251 msgid "near" msgstr "возле" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "zoom" msgstr "масштаб" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -5445,5 +5870,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 msgid "Slippy map" msgstr "Интерактивная карта" @@ -5470,47 +5895,75 @@ msgstr "Номера квадратов" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37 -#, java-format -msgid "History for {0} {1}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44 +#, fuzzy, java-format +msgid "History for node {0}" msgstr "История для {0}{1}" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 +#, fuzzy, java-format +msgid "History for way {0}" +msgstr "История для {0}{1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, fuzzy, java-format +msgid "History for relation {0}" +msgstr "История для {0}{1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 msgid "Close the dialog" msgstr "Закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 +#, fuzzy +msgid "Reload the history from the server" +msgstr "Показать историю выделенного примитива" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 msgid "history not initialized yet. Failed to set reference primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:182 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201 #, java-format msgid "failed to set reference. reference id {0} doesn't match history id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185 #, java-format msgid "failed to set reference. reference version {0} not available in history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199 msgid "history not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204 #, java-format msgid "failed to set current. current version {0} not available in history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#, java-format -msgid "Node {0}" -msgstr "Узел {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "Загрузить историю" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, fuzzy, java-format +msgid "id > 0 expected, got {0}" +msgstr "параметр ''{0}'' должен быть > 0, текущее значение ''{1}''" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, fuzzy, java-format +msgid "Loading history for node {0}" +msgstr "Загрузка истории для {0} с id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, fuzzy, java-format +msgid "Loading history for way {0}" +msgstr "Загрузка истории для {0} с id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, fuzzy, java-format +msgid "Loading history for relation {0}" +msgstr "Загрузка истории для {0} с id {1}" #. item "Streets/Motorway" text "Reference" @@ -5828,14 +6281,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -6011,8 +6478,14 @@ #. item "Shops/Supermarket" label "Edit Supermarket" #. +#. item "Shops/Chemist" label "Edit Chemist" +#. #. item "Shops/Convenience Store" label "Edit Convenience Store" #. #. item "Shops/Kiosk" label "Edit Kiosk" #. +#. item "Shops/Book Store" label "Edit Book Store" +#. +#. item "Shops/Travel Agency" label "Edit Travel Agency" +#. #. item "Shops/Butcher" label "Edit Butcher" #. @@ -6109,4 +6582,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6220,6 +6696,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 #: build/trans_presets.java:66 build/trans_presets.java:102 #: build/trans_presets.java:142 build/trans_presets.java:179 @@ -6227,156 +6703,174 @@ #: build/trans_presets.java:234 build/trans_presets.java:252 #: build/trans_presets.java:272 build/trans_presets.java:305 -#: build/trans_presets.java:350 build/trans_presets.java:370 -#: build/trans_presets.java:385 build/trans_presets.java:402 -#: build/trans_presets.java:422 build/trans_presets.java:442 -#: build/trans_presets.java:461 build/trans_presets.java:479 -#: build/trans_presets.java:499 build/trans_presets.java:519 -#: build/trans_presets.java:540 build/trans_presets.java:561 -#: build/trans_presets.java:582 build/trans_presets.java:603 -#: build/trans_presets.java:624 build/trans_presets.java:653 -#: build/trans_presets.java:674 build/trans_presets.java:687 -#: build/trans_presets.java:700 build/trans_presets.java:713 -#: build/trans_presets.java:726 build/trans_presets.java:739 -#: build/trans_presets.java:750 build/trans_presets.java:759 -#: build/trans_presets.java:806 build/trans_presets.java:827 -#: build/trans_presets.java:836 build/trans_presets.java:896 -#: build/trans_presets.java:1046 build/trans_presets.java:1054 -#: build/trans_presets.java:1062 build/trans_presets.java:1070 -#: build/trans_presets.java:1080 build/trans_presets.java:1088 -#: build/trans_presets.java:1093 build/trans_presets.java:1100 -#: build/trans_presets.java:1107 build/trans_presets.java:1112 -#: build/trans_presets.java:1120 build/trans_presets.java:1129 -#: build/trans_presets.java:1135 build/trans_presets.java:1141 -#: build/trans_presets.java:1146 build/trans_presets.java:1152 -#: build/trans_presets.java:1158 build/trans_presets.java:1167 -#: build/trans_presets.java:1176 build/trans_presets.java:1183 -#: build/trans_presets.java:1191 build/trans_presets.java:1204 -#: build/trans_presets.java:1210 build/trans_presets.java:1219 -#: build/trans_presets.java:1225 build/trans_presets.java:1231 -#: build/trans_presets.java:1239 build/trans_presets.java:1294 -#: build/trans_presets.java:1341 build/trans_presets.java:1347 -#: build/trans_presets.java:1353 build/trans_presets.java:1359 -#: build/trans_presets.java:1365 build/trans_presets.java:1376 -#: build/trans_presets.java:1384 build/trans_presets.java:1393 -#: build/trans_presets.java:1400 build/trans_presets.java:1406 -#: build/trans_presets.java:1414 build/trans_presets.java:1421 -#: build/trans_presets.java:1430 build/trans_presets.java:1438 -#: build/trans_presets.java:1445 build/trans_presets.java:1456 -#: build/trans_presets.java:1466 build/trans_presets.java:1476 -#: build/trans_presets.java:1496 build/trans_presets.java:1508 -#: build/trans_presets.java:1519 build/trans_presets.java:1536 -#: build/trans_presets.java:1543 build/trans_presets.java:1558 -#: build/trans_presets.java:1565 build/trans_presets.java:1570 -#: build/trans_presets.java:1576 build/trans_presets.java:1582 -#: build/trans_presets.java:1587 build/trans_presets.java:1593 -#: build/trans_presets.java:1599 build/trans_presets.java:1607 -#: build/trans_presets.java:1614 build/trans_presets.java:1621 -#: build/trans_presets.java:1627 build/trans_presets.java:1632 -#: build/trans_presets.java:1638 build/trans_presets.java:1644 -#: build/trans_presets.java:1651 build/trans_presets.java:1658 -#: build/trans_presets.java:1665 build/trans_presets.java:1671 -#: build/trans_presets.java:1677 build/trans_presets.java:1683 -#: build/trans_presets.java:1691 build/trans_presets.java:1697 -#: build/trans_presets.java:1704 build/trans_presets.java:1712 -#: build/trans_presets.java:1718 build/trans_presets.java:1725 -#: build/trans_presets.java:1731 build/trans_presets.java:1741 -#: build/trans_presets.java:1746 build/trans_presets.java:1753 -#: build/trans_presets.java:1759 build/trans_presets.java:1765 -#: build/trans_presets.java:1771 build/trans_presets.java:1776 +#: build/trans_presets.java:351 build/trans_presets.java:371 +#: build/trans_presets.java:386 build/trans_presets.java:403 +#: build/trans_presets.java:423 build/trans_presets.java:443 +#: build/trans_presets.java:463 build/trans_presets.java:482 +#: build/trans_presets.java:502 build/trans_presets.java:522 +#: build/trans_presets.java:543 build/trans_presets.java:564 +#: build/trans_presets.java:585 build/trans_presets.java:606 +#: build/trans_presets.java:627 build/trans_presets.java:658 +#: build/trans_presets.java:679 build/trans_presets.java:692 +#: build/trans_presets.java:705 build/trans_presets.java:718 +#: build/trans_presets.java:731 build/trans_presets.java:744 +#: build/trans_presets.java:755 build/trans_presets.java:764 +#: build/trans_presets.java:811 build/trans_presets.java:832 +#: build/trans_presets.java:841 build/trans_presets.java:901 +#: build/trans_presets.java:1051 build/trans_presets.java:1059 +#: build/trans_presets.java:1067 build/trans_presets.java:1075 +#: build/trans_presets.java:1085 build/trans_presets.java:1093 +#: build/trans_presets.java:1098 build/trans_presets.java:1105 +#: build/trans_presets.java:1112 build/trans_presets.java:1117 +#: build/trans_presets.java:1125 build/trans_presets.java:1134 +#: build/trans_presets.java:1140 build/trans_presets.java:1146 +#: build/trans_presets.java:1151 build/trans_presets.java:1157 +#: build/trans_presets.java:1163 build/trans_presets.java:1172 +#: build/trans_presets.java:1181 build/trans_presets.java:1188 +#: build/trans_presets.java:1196 build/trans_presets.java:1209 +#: build/trans_presets.java:1215 build/trans_presets.java:1224 +#: build/trans_presets.java:1230 build/trans_presets.java:1236 +#: build/trans_presets.java:1244 build/trans_presets.java:1299 +#: build/trans_presets.java:1346 build/trans_presets.java:1352 +#: build/trans_presets.java:1358 build/trans_presets.java:1364 +#: build/trans_presets.java:1370 build/trans_presets.java:1381 +#: build/trans_presets.java:1390 build/trans_presets.java:1405 +#: build/trans_presets.java:1412 build/trans_presets.java:1418 +#: build/trans_presets.java:1426 build/trans_presets.java:1433 +#: build/trans_presets.java:1442 build/trans_presets.java:1450 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1548 +#: build/trans_presets.java:1555 build/trans_presets.java:1570 +#: build/trans_presets.java:1577 build/trans_presets.java:1582 +#: build/trans_presets.java:1588 build/trans_presets.java:1594 +#: build/trans_presets.java:1599 build/trans_presets.java:1605 +#: build/trans_presets.java:1611 build/trans_presets.java:1619 +#: build/trans_presets.java:1627 build/trans_presets.java:1635 +#: build/trans_presets.java:1642 build/trans_presets.java:1648 +#: build/trans_presets.java:1655 build/trans_presets.java:1662 +#: build/trans_presets.java:1670 build/trans_presets.java:1677 +#: build/trans_presets.java:1685 build/trans_presets.java:1692 +#: build/trans_presets.java:1698 build/trans_presets.java:1705 +#: build/trans_presets.java:1712 build/trans_presets.java:1719 +#: build/trans_presets.java:1736 build/trans_presets.java:1744 +#: build/trans_presets.java:1759 build/trans_presets.java:1769 #: build/trans_presets.java:1781 build/trans_presets.java:1788 -#: build/trans_presets.java:1794 build/trans_presets.java:1799 -#: build/trans_presets.java:1807 build/trans_presets.java:1816 -#: build/trans_presets.java:1825 build/trans_presets.java:1834 -#: build/trans_presets.java:1843 build/trans_presets.java:1848 -#: build/trans_presets.java:1855 build/trans_presets.java:1861 -#: build/trans_presets.java:1867 build/trans_presets.java:1873 -#: build/trans_presets.java:1879 build/trans_presets.java:1885 -#: build/trans_presets.java:1891 build/trans_presets.java:1897 -#: build/trans_presets.java:1903 build/trans_presets.java:1909 -#: build/trans_presets.java:1915 build/trans_presets.java:1921 -#: build/trans_presets.java:1927 build/trans_presets.java:1933 -#: build/trans_presets.java:1939 build/trans_presets.java:1946 -#: build/trans_presets.java:1955 build/trans_presets.java:1963 -#: build/trans_presets.java:1969 build/trans_presets.java:1975 -#: build/trans_presets.java:1981 build/trans_presets.java:1987 -#: build/trans_presets.java:1993 build/trans_presets.java:1999 -#: build/trans_presets.java:2005 build/trans_presets.java:2011 -#: build/trans_presets.java:2017 build/trans_presets.java:2023 -#: build/trans_presets.java:2029 build/trans_presets.java:2035 -#: build/trans_presets.java:2041 build/trans_presets.java:2047 -#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:1794 build/trans_presets.java:1804 +#: build/trans_presets.java:1809 build/trans_presets.java:1817 +#: build/trans_presets.java:1824 build/trans_presets.java:1830 +#: build/trans_presets.java:1836 build/trans_presets.java:1841 +#: build/trans_presets.java:1846 build/trans_presets.java:1853 +#: build/trans_presets.java:1859 build/trans_presets.java:1864 +#: build/trans_presets.java:1872 build/trans_presets.java:1881 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1914 +#: build/trans_presets.java:1922 build/trans_presets.java:1928 +#: build/trans_presets.java:1934 build/trans_presets.java:1940 +#: build/trans_presets.java:1946 build/trans_presets.java:1952 +#: build/trans_presets.java:1958 build/trans_presets.java:1964 +#: build/trans_presets.java:1970 build/trans_presets.java:1976 +#: build/trans_presets.java:1982 build/trans_presets.java:1988 +#: build/trans_presets.java:1994 build/trans_presets.java:2000 +#: build/trans_presets.java:2006 build/trans_presets.java:2013 +#: build/trans_presets.java:2022 build/trans_presets.java:2030 +#: build/trans_presets.java:2036 build/trans_presets.java:2042 +#: build/trans_presets.java:2048 build/trans_presets.java:2054 +#: build/trans_presets.java:2060 build/trans_presets.java:2066 #: build/trans_presets.java:2072 build/trans_presets.java:2078 -#: build/trans_presets.java:2084 build/trans_presets.java:2091 -#: build/trans_presets.java:2098 build/trans_presets.java:2106 -#: build/trans_presets.java:2113 build/trans_presets.java:2119 -#: build/trans_presets.java:2125 build/trans_presets.java:2131 -#: build/trans_presets.java:2137 build/trans_presets.java:2143 +#: build/trans_presets.java:2084 build/trans_presets.java:2090 +#: build/trans_presets.java:2096 build/trans_presets.java:2102 +#: build/trans_presets.java:2108 build/trans_presets.java:2114 +#: build/trans_presets.java:2120 build/trans_presets.java:2126 +#: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2158 -#: build/trans_presets.java:2164 build/trans_presets.java:2171 -#: build/trans_presets.java:2179 build/trans_presets.java:2210 -#: build/trans_presets.java:2215 build/trans_presets.java:2220 -#: build/trans_presets.java:2225 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2251 build/trans_presets.java:2257 -#: build/trans_presets.java:2263 build/trans_presets.java:2269 -#: build/trans_presets.java:2275 build/trans_presets.java:2285 -#: build/trans_presets.java:2378 build/trans_presets.java:2385 -#: build/trans_presets.java:2399 build/trans_presets.java:2405 -#: build/trans_presets.java:2411 build/trans_presets.java:2432 -#: build/trans_presets.java:2438 build/trans_presets.java:2444 -#: build/trans_presets.java:2449 build/trans_presets.java:2455 -#: build/trans_presets.java:2460 build/trans_presets.java:2465 -#: build/trans_presets.java:2470 build/trans_presets.java:2475 -#: build/trans_presets.java:2480 build/trans_presets.java:2486 -#: build/trans_presets.java:2492 build/trans_presets.java:2498 -#: build/trans_presets.java:2503 build/trans_presets.java:2508 -#: build/trans_presets.java:2513 build/trans_presets.java:2518 -#: build/trans_presets.java:2523 build/trans_presets.java:2529 -#: build/trans_presets.java:2535 build/trans_presets.java:2541 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2560 build/trans_presets.java:2567 -#: build/trans_presets.java:2581 build/trans_presets.java:2586 -#: build/trans_presets.java:2593 build/trans_presets.java:2599 -#: build/trans_presets.java:2619 build/trans_presets.java:2628 -#: build/trans_presets.java:2634 build/trans_presets.java:2640 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2673 build/trans_presets.java:2679 -#: build/trans_presets.java:2685 build/trans_presets.java:2693 -#: build/trans_presets.java:2700 build/trans_presets.java:2707 -#: build/trans_presets.java:2713 build/trans_presets.java:2720 -#: build/trans_presets.java:2727 build/trans_presets.java:2736 -#: build/trans_presets.java:2742 build/trans_presets.java:2748 -#: build/trans_presets.java:2754 build/trans_presets.java:2760 -#: build/trans_presets.java:2769 build/trans_presets.java:2779 -#: build/trans_presets.java:2788 build/trans_presets.java:2794 -#: build/trans_presets.java:2800 build/trans_presets.java:2805 -#: build/trans_presets.java:2811 build/trans_presets.java:2817 -#: build/trans_presets.java:2826 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2862 build/trans_presets.java:2869 -#: build/trans_presets.java:2875 build/trans_presets.java:2880 -#: build/trans_presets.java:2887 build/trans_presets.java:2894 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2917 build/trans_presets.java:2923 -#: build/trans_presets.java:2929 build/trans_presets.java:2936 -#: build/trans_presets.java:2942 build/trans_presets.java:2949 -#: build/trans_presets.java:2955 build/trans_presets.java:2961 -#: build/trans_presets.java:2967 build/trans_presets.java:2973 -#: build/trans_presets.java:2986 build/trans_presets.java:3000 -#: build/trans_presets.java:3014 +#: build/trans_presets.java:2165 build/trans_presets.java:2173 +#: build/trans_presets.java:2180 build/trans_presets.java:2186 +#: build/trans_presets.java:2192 build/trans_presets.java:2198 +#: build/trans_presets.java:2204 build/trans_presets.java:2210 +#: build/trans_presets.java:2218 build/trans_presets.java:2225 +#: build/trans_presets.java:2232 build/trans_presets.java:2239 +#: build/trans_presets.java:2247 build/trans_presets.java:2279 +#: build/trans_presets.java:2284 build/trans_presets.java:2289 +#: build/trans_presets.java:2294 build/trans_presets.java:2300 +#: build/trans_presets.java:2306 build/trans_presets.java:2312 +#: build/trans_presets.java:2320 build/trans_presets.java:2326 +#: build/trans_presets.java:2332 build/trans_presets.java:2338 +#: build/trans_presets.java:2344 build/trans_presets.java:2354 +#: build/trans_presets.java:2448 build/trans_presets.java:2455 +#: build/trans_presets.java:2469 build/trans_presets.java:2475 +#: build/trans_presets.java:2482 build/trans_presets.java:2489 +#: build/trans_presets.java:2495 build/trans_presets.java:2501 +#: build/trans_presets.java:2523 build/trans_presets.java:2530 +#: build/trans_presets.java:2537 build/trans_presets.java:2543 +#: build/trans_presets.java:2550 build/trans_presets.java:2556 +#: build/trans_presets.java:2562 build/trans_presets.java:2568 +#: build/trans_presets.java:2574 build/trans_presets.java:2580 +#: build/trans_presets.java:2587 build/trans_presets.java:2594 +#: build/trans_presets.java:2601 build/trans_presets.java:2607 +#: build/trans_presets.java:2613 build/trans_presets.java:2619 +#: build/trans_presets.java:2625 build/trans_presets.java:2631 +#: build/trans_presets.java:2638 build/trans_presets.java:2645 +#: build/trans_presets.java:2652 build/trans_presets.java:2658 +#: build/trans_presets.java:2664 build/trans_presets.java:2674 +#: build/trans_presets.java:2683 build/trans_presets.java:2698 +#: build/trans_presets.java:2704 build/trans_presets.java:2712 +#: build/trans_presets.java:2719 build/trans_presets.java:2739 +#: build/trans_presets.java:2749 build/trans_presets.java:2755 +#: build/trans_presets.java:2761 build/trans_presets.java:2767 +#: build/trans_presets.java:2773 build/trans_presets.java:2780 +#: build/trans_presets.java:2787 build/trans_presets.java:2794 +#: build/trans_presets.java:2800 build/trans_presets.java:2806 +#: build/trans_presets.java:2814 build/trans_presets.java:2821 +#: build/trans_presets.java:2828 build/trans_presets.java:2835 +#: build/trans_presets.java:2841 build/trans_presets.java:2848 +#: build/trans_presets.java:2855 build/trans_presets.java:2864 +#: build/trans_presets.java:2870 build/trans_presets.java:2876 +#: build/trans_presets.java:2882 build/trans_presets.java:2888 +#: build/trans_presets.java:2897 build/trans_presets.java:2907 +#: build/trans_presets.java:2916 build/trans_presets.java:2922 +#: build/trans_presets.java:2928 build/trans_presets.java:2933 +#: build/trans_presets.java:2939 build/trans_presets.java:2945 +#: build/trans_presets.java:2954 build/trans_presets.java:2960 +#: build/trans_presets.java:2966 build/trans_presets.java:2972 +#: build/trans_presets.java:2978 build/trans_presets.java:2984 +#: build/trans_presets.java:2990 build/trans_presets.java:2997 +#: build/trans_presets.java:3003 build/trans_presets.java:3008 +#: build/trans_presets.java:3015 build/trans_presets.java:3022 +#: build/trans_presets.java:3028 build/trans_presets.java:3037 +#: build/trans_presets.java:3045 build/trans_presets.java:3051 +#: build/trans_presets.java:3057 build/trans_presets.java:3064 +#: build/trans_presets.java:3070 build/trans_presets.java:3077 +#: build/trans_presets.java:3083 build/trans_presets.java:3089 +#: build/trans_presets.java:3095 build/trans_presets.java:3101 +#: build/trans_presets.java:3114 build/trans_presets.java:3128 +#: build/trans_presets.java:3142 msgid "Name" msgstr "Название" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45 -#, java-format +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 +#, fuzzy, java-format msgid "" "Version {0} created on {1} by " -"{2}" +"{2} in changeset {3}" msgstr "" "Версия {0} дата создания: {1} автор: " "{2}" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "набор изменений" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Подробнее" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Последние изменения: {0}" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 #, java-format @@ -6384,32 +6878,290 @@ msgstr "Версия {0} дата создания: {1} автор: {2}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 msgid "Version" msgstr "Версия" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 +msgid "Launch a file chooser to select a file" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#, fuzzy +msgid "Select filename" +msgstr "Название улицы" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "Yes" +msgstr "Да" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "No" +msgstr "Нет" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#, java-format +msgid "Layer ''{0}'' has modifications which should be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#, java-format +msgid "Layer ''{0}'' has no modifications to be uploaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +#, java-format +msgid "" +"Layer ''{0}'' has modifications which should be saved to its assoicated file " +"''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +#, java-format +msgid "Layer ''{0}'' has no modifications to be saved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +msgid "No file associated with this layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#, fuzzy +msgid "Please select a file" +msgstr "Выберите значение" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "Слой ''{0}'' должен быть в списке слоёв" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +#, java-format +msgid "File ''{0}'' is not writable. Please enter another file name." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#, java-format +msgid "Select to upload layer ''{0}'' to the server ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49 +#, java-format +msgid "Saving layer to ''{0}'' ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 +msgid "Unsaved changes - Save/Upload before exiting?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 +msgid "Unsaved changes - Save/Upload before deleting?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 +msgid "Uploading and saving modified layers ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 +#, java-format +msgid "" +"{0} layer has unresolved conflicts.
Either resolve them first or " +"discard the modifications.
Layer with conflicts:" +msgid_plural "" +"{0} layers have unresolved conflicts.
Either resolve them first or " +"discard the modifications.
Layers with conflicts:" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +#, fuzzy +msgid "Unsafed data and conflicts" +msgstr "Инсправить конфликт тегов" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 +#, java-format +msgid "" +"{0} layer needs saving but has no associated file.
Either select a " +"file for this layer or discard the changes.
Layer without a file:" +msgid_plural "" +"{0} layers need saving but have no associated file.
Either select a " +"file for each of them or discard the changes.
Layers without a file:" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 +msgid "Unsafed data and missing associated file" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 +#, java-format +msgid "" +"{0} layer needs saving but has an associated file
which can't be " +"written.
Either select another file for this layer or discard the changes." +"
Layer with a non-writable file:" +msgid_plural "" +"{0} layers need saving but have associated files
which can't be " +"written.
Either select another file for each of them or discard the " +"changes.
Layers with non-writable files:" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 +msgid "Unsafed data non-writable files" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 +msgid "Close this dialog and resume editing in JOSM" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 +msgid "Exit JOSM without saving. Unsaved changes are lost." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#, fuzzy +msgid "Discard and Delete" +msgstr "Отменить и выйти" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 +msgid "Delete layers without saving. Unsaved changes are lost." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 +msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#, fuzzy +msgid "Save and Delete" +msgstr "Сохранить и выйти" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 +msgid "Save/Upload layers before deleting. Unsaved changes are not lost." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 +#, java-format +msgid "Preparing layer ''{0}'' for upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +msgid "" +"An upload and/or save operation of one layer with modifications
was " +"cancelled or has been failed." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +msgid "Incomplete upload and/or save" +msgstr "" + +#. item "Streets/Motorway" text "Name" +#. item "Streets/Motorway Link" label "Edit Motorway Link" +#. +#. +#. +#. item "Streets/Trunk" text "Name" +#. item "Streets/Trunk Link" text "Reference" +#. +#. item "Streets/Primary" text "Name" +#. item "Streets/Primary Link" label "Edit Primary Link" +#. +#. +#. +#. item "Streets/Secondary" text "Name" +#. item "Streets/Tertiary" text "Name" +#. item "Streets/Unclassified" check "Embankment" +#. item "Streets/Residential" check "Embankment" +#. item "Streets/Living Street" check "Embankment" +#. item "Streets/Service" check "Embankment" +#. item "Streets/Road (Unknown Type)" check "Embankment" +#. item "Streets/Roundabout" check "Embankment" +#. item "Streets/Bridge" text "Name" +#. item "Streets/Tunnel" text "Name" +#. item "Ways/Construction" check "Embankment" +#. item "Ways/Bridleway" check "Embankment" +#. item "Ways/Pedestrian" check "Embankment" +#. item "Ways/Steps" check "Embankment" +#. item "Ways/Path" check "Embankment" +#. item "Water/Drain" text "Name" +#. item "Water/Stream" text "Name" +#. item "Water/Canal" text "Name" +#. item "Water/River" text "Name" +#. item "Railway/Bus Guideway" check "Embankment" +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: build/trans_presets.java:67 build/trans_presets.java:84 +#: build/trans_presets.java:103 build/trans_presets.java:122 +#: build/trans_presets.java:143 build/trans_presets.java:159 +#: build/trans_presets.java:180 build/trans_presets.java:200 +#: build/trans_presets.java:223 build/trans_presets.java:241 +#: build/trans_presets.java:259 build/trans_presets.java:278 +#: build/trans_presets.java:311 build/trans_presets.java:357 +#: build/trans_presets.java:372 build/trans_presets.java:387 +#: build/trans_presets.java:409 build/trans_presets.java:429 +#: build/trans_presets.java:450 build/trans_presets.java:470 +#: build/trans_presets.java:489 build/trans_presets.java:508 +#: build/trans_presets.java:528 build/trans_presets.java:549 +#: build/trans_presets.java:570 build/trans_presets.java:591 +#: build/trans_presets.java:612 build/trans_presets.java:633 +#: build/trans_presets.java:664 build/trans_presets.java:1060 +#: build/trans_presets.java:1068 build/trans_presets.java:1076 +#: build/trans_presets.java:1086 build/trans_presets.java:1305 +msgid "Layer" +msgstr "Слой" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#, fuzzy +msgid "Should upload?" +msgstr "При загрузке" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +msgid "Should save?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#, fuzzy +msgid "Filename" +msgstr "Файл" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Выгрузка" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#, fuzzy +msgid "Preparing primitives to upload ..." +msgstr "Не выбраны примитивы для обновления." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "Изображения для {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 msgid "Read GPX..." msgstr "Прочесть GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 #, java-format msgid "No time for point {0} x {1}" msgstr "Нет указания времени для точки {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 #, 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:322 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 msgid "No images with readable timestamps found." msgstr "Не найдено изображений с информацией о времени." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -6417,29 +7169,29 @@ msgstr "Чтение {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "Изображения с данными о местоположении" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 #, java-format msgid "GPS start: {0}" msgstr "Начало GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS end: {0}" msgstr "Конец GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 #, java-format msgid "current delta: {0}s" msgstr "текущая разница: {0} с." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "разница в часовых поясах: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -6449,14 +7201,14 @@ msgstr[2] "изображений" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 #, java-format msgid "{0} within the track." msgstr "{0} в пределах трека" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Синхронизация часов" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -6464,82 +7216,82 @@ msgstr "Изображения JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Невозможно прочесть дату из файла \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "EXIF файла \"{0}\" не содержит информации о времени." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Изображение" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 msgid "GPS unit timezone (difference to photo)" msgstr "Часовой пояс GPS объекта (отличается от фотографии)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 msgid "Synchronize Time with GPS Unit" msgstr "Синхронизировать время с GPS приёмником" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 msgid "Time entered could not be parsed." msgstr "Введённое время невозможно использовать" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 msgid "gps point" msgstr "точка GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196 msgid "Customize line drawing" msgstr "Настроить отрисовку линий" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200 +msgid "Use global settings." +msgstr "Использовать глобальные настройки." + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201 -msgid "Use global settings." -msgstr "Использовать глобальные настройки." +msgid "Draw lines between points for this layer." +msgstr "Отображать линии между точками для этого слоя." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 -msgid "Draw lines between points for this layer." -msgstr "Отображать линии между точками для этого слоя." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Do not draw lines between points for this layer." msgstr "Не отображать линии между точками для этого слоя." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "Select line drawing options" msgstr "Выбрать варианты отрисовки линий" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Выбрать цвет" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237 +#: ../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:164 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" @@ -6602,5 +7354,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Description: {0}" @@ -6616,10 +7368,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59 msgid "Convert to data layer" msgstr "Преобразовать в слой данных" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -6630,11 +7382,11 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 @@ -6676,4 +7428,9 @@ "Продолжить?" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Загрузка данных" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6696,65 +7453,65 @@ "их время, были проигнорированы." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 #, java-format msgid "Data Layer {0}" msgstr "Слой данных {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 msgid "outside downloaded area" msgstr "вне области для скачивания" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #, java-format msgid "version {0}" msgstr "версия {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" "Внимание: совместное использование данных версий 0.6 и 0.5 в версии 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389 #, java-format msgid "{0} consists of:" msgstr "{0} состоит из:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 #, java-format msgid " ({0} deleted.)" msgstr " ({0} удалено)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 msgid "unset" msgstr "отключено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 #, java-format msgid "API version: {0}" msgstr "Версия API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 #: ../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:159 -#: build/trans_presets.java:1856 build/trans_presets.java:1862 -#: build/trans_presets.java:1868 build/trans_presets.java:1874 -#: build/trans_presets.java:1880 build/trans_presets.java:1886 -#: build/trans_presets.java:1892 build/trans_presets.java:1898 -#: build/trans_presets.java:1904 build/trans_presets.java:1910 -#: build/trans_presets.java:1916 build/trans_presets.java:1922 -#: build/trans_presets.java:1928 build/trans_presets.java:1934 -#: build/trans_presets.java:1940 build/trans_presets.java:1949 -#: build/trans_presets.java:1956 build/trans_presets.java:1964 -#: build/trans_presets.java:1970 build/trans_presets.java:1976 -#: build/trans_presets.java:1982 build/trans_presets.java:1988 -#: build/trans_presets.java:1994 build/trans_presets.java:2000 -#: build/trans_presets.java:2006 build/trans_presets.java:2012 -#: build/trans_presets.java:2018 build/trans_presets.java:2024 -#: build/trans_presets.java:2030 build/trans_presets.java:2036 -#: build/trans_presets.java:2042 build/trans_presets.java:2048 -#: build/trans_presets.java:2054 build/trans_presets.java:2060 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 +#: build/trans_presets.java:1923 build/trans_presets.java:1929 +#: build/trans_presets.java:1935 build/trans_presets.java:1941 +#: build/trans_presets.java:1947 build/trans_presets.java:1953 +#: build/trans_presets.java:1959 build/trans_presets.java:1965 +#: build/trans_presets.java:1971 build/trans_presets.java:1977 +#: build/trans_presets.java:1983 build/trans_presets.java:1989 +#: build/trans_presets.java:1995 build/trans_presets.java:2001 +#: build/trans_presets.java:2007 build/trans_presets.java:2016 +#: build/trans_presets.java:2023 build/trans_presets.java:2031 +#: build/trans_presets.java:2037 build/trans_presets.java:2043 +#: build/trans_presets.java:2049 build/trans_presets.java:2055 +#: build/trans_presets.java:2061 build/trans_presets.java:2067 +#: build/trans_presets.java:2073 build/trans_presets.java:2079 +#: build/trans_presets.java:2085 build/trans_presets.java:2091 +#: build/trans_presets.java:2097 build/trans_presets.java:2103 +#: build/trans_presets.java:2109 build/trans_presets.java:2115 +#: build/trans_presets.java:2121 build/trans_presets.java:2127 msgid "track" msgid_plural "tracks" @@ -6763,5 +7520,5 @@ msgstr[2] "треков" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159 msgid "point" msgid_plural "points" @@ -6770,5 +7527,5 @@ msgstr[2] "точек" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188 #, java-format msgid "a track with {0} point" @@ -6778,5 +7535,5 @@ msgstr[2] "трек с {0} точками" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 #, java-format msgid "{0} consists of {1} track" @@ -6786,5 +7543,5 @@ msgstr[2] "{0} состоит из {1} треков" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 #, java-format msgid "{0} point" @@ -6794,9 +7551,9 @@ msgstr[2] "{0} точек" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151 msgid "gps marker" msgstr "маркер GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172 msgid "marker" msgid_plural "markers" @@ -6805,5 +7562,5 @@ msgstr[2] "маркеров" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6824,5 +7581,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250 #, java-format msgid "Audio synchronized at point {0}." @@ -6830,5 +7587,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259 msgid "Unable to synchronize in layer being played." msgstr "Невозможно синхронизировать слой который используется" @@ -6858,5 +7615,5 @@ msgstr "Показать/скрыть текст и значки маркеров." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6866,5 +7623,5 @@ "которым связана звуковая дорожка (после первого маркера)." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6874,29 +7631,29 @@ "или на точку трека, где вы хотите синхронизировать." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241 msgid "Unable to create new audio marker." msgstr "Невозможно создать новый аудио-маркер." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 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:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "(URL was: " msgstr "(по ссылке: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "Error displaying URL" msgstr "Невозможно отобразить URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 msgid "Advanced Preferences" msgstr "Дополнительные параметры" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Setting Preference entries directly. Use with caution!" msgstr "Установка параметров напрямую. Пользоваться с осторожностью!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 #: ../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 @@ -6904,26 +7661,26 @@ msgstr "Поиск: " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100 msgid "Current value is default." msgstr "Текущее значение - по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102 #, java-format msgid "Default value is ''{0}''." msgstr "Текущее значение - ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105 msgid "Default value currently unknown (setting has not been used yet)." msgstr "Значение по умолчанию неизвестно (настройка ещё не использовалась)" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654 msgid "Please select the row to edit." msgstr "Пожалуйста, выберите ряд для редактирования." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6931,14 +7688,14 @@ msgstr "Новое значение для {0}" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Пожалуйста, выберите ряд для удаления." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 msgid "Enter a new key/value pair" msgstr "Введите новый ключ и значение" @@ -7078,40 +7835,40 @@ msgstr "Калибровка звукозаписи" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Цвет" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 #, java-format msgid "Paint style {0}: {1}" msgstr "Стиль точки {0}:{1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 #, java-format msgid "Layer: {0}" msgstr "Слой: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Выбрать" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 #, java-format msgid "Choose a color for {0}" msgstr "Выберите цвет для {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 msgid "Set to default" msgstr "Задать в значение по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 msgid "Set all to default" msgstr "Задать все значения по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 msgid "Colors used by different objects in JOSM." msgstr "Цвета, используемые разными объектами в JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Цвета" @@ -7157,5 +7914,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Авто" @@ -7177,16 +7934,17 @@ #. item "Public Transport/Subway Entrance" check "Wheelchair" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:323 build/trans_presets.java:649 -#: build/trans_presets.java:852 build/trans_presets.java:871 -#: build/trans_presets.java:885 build/trans_presets.java:907 -#: build/trans_presets.java:944 build/trans_presets.java:957 -#: build/trans_presets.java:969 build/trans_presets.java:981 -#: build/trans_presets.java:993 build/trans_presets.java:1005 -#: build/trans_presets.java:1015 build/trans_presets.java:1024 -#: build/trans_presets.java:1033 build/trans_presets.java:1425 -#: build/trans_presets.java:1498 +#: build/trans_presets.java:324 build/trans_presets.java:650 +#: build/trans_presets.java:857 build/trans_presets.java:876 +#: build/trans_presets.java:890 build/trans_presets.java:912 +#: build/trans_presets.java:949 build/trans_presets.java:962 +#: build/trans_presets.java:974 build/trans_presets.java:986 +#: build/trans_presets.java:998 build/trans_presets.java:1010 +#: build/trans_presets.java:1020 build/trans_presets.java:1029 +#: build/trans_presets.java:1038 build/trans_presets.java:1437 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Вело" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7216,12 +7974,12 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:324 build/trans_presets.java:651 -#: build/trans_presets.java:851 build/trans_presets.java:870 -#: build/trans_presets.java:884 build/trans_presets.java:906 -#: build/trans_presets.java:943 build/trans_presets.java:956 -#: build/trans_presets.java:968 build/trans_presets.java:980 -#: build/trans_presets.java:992 build/trans_presets.java:1004 -#: build/trans_presets.java:1014 build/trans_presets.java:1023 -#: build/trans_presets.java:1032 +#: build/trans_presets.java:325 build/trans_presets.java:649 +#: build/trans_presets.java:856 build/trans_presets.java:875 +#: build/trans_presets.java:889 build/trans_presets.java:911 +#: build/trans_presets.java:948 build/trans_presets.java:961 +#: build/trans_presets.java:973 build/trans_presets.java:985 +#: build/trans_presets.java:997 build/trans_presets.java:1009 +#: build/trans_presets.java:1019 build/trans_presets.java:1028 +#: build/trans_presets.java:1037 msgid "Foot" msgstr "Пешком" @@ -7407,5 +8165,5 @@ #. Show splash screen on startup #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:79 msgid "Show splash screen at startup" msgstr "Показывать заставку при запуске" @@ -7413,23 +8171,34 @@ #. Show ID in selection #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:84 msgid "Show object ID in selection lists" msgstr "Показывать ID объектов в списке выбора" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87 +#, fuzzy +msgid "Show localized name in selection lists" +msgstr "Показывать ID объектов в списке выбора" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:93 msgid "Draw rubber-band helper line" msgstr "Рисовать «резиновую» вспомогательную линию" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:42 msgid "Modeless working (Potlatch style)" msgstr "Безрежимная работа (в стиле Potlatch)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91 +#. Show localized names +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 +#, fuzzy +msgid "Show localized name in selection lists, if available" +msgstr "Показывать ID объектов в списке выбора" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "Не требует переключения режимов (рабочий стиль potlatch)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109 msgid "Look and Feel" msgstr "Оформление" @@ -7461,54 +8230,54 @@ msgstr "Использованный стиль" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45 msgid "Configure available plugins." msgstr "Настроить доступные модули." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Скачать список" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100 msgid "Update" msgstr "Обновить" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66 msgid "Configure Sites..." msgstr "Настроить сайты..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91 msgid "Add JOSM Plugin description URL." msgstr "Добавить ссылку на описание JOSM плагина" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Enter URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128 msgid "Please select an entry." msgstr "Пожалуйста, выберите запись." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113 msgid "Edit JOSM Plugin description URL." msgstr "Редактировать ссылку на описание JOSM плагина" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "JOSM Plugin description URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141 msgid "Configure Plugin Sites" msgstr "Настроить сайты с модулями" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Display Settings" msgstr "Настройки экрана" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "" "Various settings that influence the visual representation of the whole " @@ -7516,41 +8285,41 @@ msgstr "Различные настройки, влияющие на внешний вид программы." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Параметры соединения" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings for the OSM server." msgstr "Параметры соединения с сервером OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Map 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 map projection and data interpretation." msgstr "Параметры проекции карты и отображения данных" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Параметры Аудио" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Settings for the audio player and audio markers." msgstr "Параметры звукового проигрывателя, и звуковых маркеров." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 msgid "You have to restart JOSM for some settings to take effect." msgstr "Необходимо перезапустить JOSM, чтобы изменения вступили в силу." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:54 msgid "Display coordinates as" msgstr "Отображать координаты как" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Тип проекции" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Картографическая проекция" @@ -7583,12 +8352,4 @@ msgid "Proxy server password" msgstr "Пароль" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -msgid "The base URL for the OSM server (REST API)" -msgstr "Основной адрес сервера OSM (REST API)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38 -msgid "Base Server URL" -msgstr "Основной адрес сервера" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -7615,61 +8376,60 @@ msgstr "Горячая клвиша" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61 #, java-format msgid "Short Description: {0}" msgstr "Краткое описание: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61 #, java-format msgid "URL: {0}" msgstr "URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 #, java-format msgid "Author: {0}" msgstr "Автор: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Webpage: {0}" msgstr "Веб-страница: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Version: {0}" 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 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293 msgid "Icon paths" msgstr "Пути к иконкам" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243 msgid "Copy defaults" msgstr "Копировать умолчания" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248 msgid "Please select the row to copy." msgstr "Пожалуйста, выберите ряд для копирования." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274 msgid "Add a new XML source to the list." msgstr "Добавить новый XML источник к списку." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Delete the selected source from the list." msgstr "Удалить источник из списка." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -7857,36 +8617,60 @@ msgstr "Группы модификаторов" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 +msgid "" +msgstr "<множественный>" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:351 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 +#, java-format +msgid "Remove old keys from up to {0} object" +msgid_plural "Remove old keys from up to {0} objects" +msgstr[0] "Удалить старые ключи из {0} объекта" +msgstr[1] "Удалить старые ключи из {0} объектов" +msgstr[2] "Удалить старые ключи из {0} объектов" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Добавить новый слой" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Удалить выбранный слой." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Подробнее" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 msgid "Optional Attributes:" msgstr "Дополнительные атрибуты:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:498 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Использовать шаблон ''{0}'' из группы ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:499 #, java-format msgid "Use preset ''{0}''" msgstr "Использовать шаблон ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 msgid "closedway" msgstr "замкнутая" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:544 #, java-format msgid "Unknown type: {0}" msgstr "Неизвестный тип: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 #, java-format @@ -7894,15 +8678,15 @@ msgstr "Не удалось прочитать помеченные настройки исходника: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:631 #, java-format msgid "Error parsing {0}: " msgstr "Ошибка при разборе {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #, java-format msgid "Elements of type {0} are supported." msgstr "Элемент типа {0} не поддерживается." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:702 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7913,22 +8697,22 @@ msgstr[2] "Изменить {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Ничего не выбрано!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 msgid "Selection unsuitable!" msgstr "Элементы выбраны неверно!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 msgid "Apply Preset" msgstr "Применить шаблон" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Изменить параметры" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 #, java-format msgid "Preset group ''{0}''" @@ -7967,11 +8751,11 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:38 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184 #, java-format msgid "Could not read \"{0}\"" msgstr "Невозможно прочитать \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:39 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -7981,38 +8765,38 @@ "лицензированных под GPL" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43 -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:42 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:24 msgid "GPX Files" msgstr "GPS файлы" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "описание трека GPS" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Добавить информацию об авторе" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Настоящее имя" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:84 msgid "E-Mail" msgstr "E-Mail" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:88 msgid "Copyright (URL)" msgstr "Авторские права (ссылка)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Набор" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "Авторские права (год)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Ключевые слова" @@ -8022,9 +8806,9 @@ msgstr "Опции экспорта" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Экспортировать и сохранить" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -8035,10 +8819,10 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:258 msgid "Choose a predefined license" msgstr "Выберите лицензию из набора" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 @@ -8048,12 +8832,12 @@ msgstr "Маркеры из {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:41 #, java-format msgid "File \"{0}\" does not exist" msgstr "Файл \"{0}\" не существует" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:44 #, java-format msgid "Parsing file \"{0}\" failed" @@ -8074,6 +8858,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:325 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:348 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -8083,20 +8867,40 @@ 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 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:375 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#, java-format +msgid "Fetching way with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:377 +#, fuzzy, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "Изменить отношение #{0} в слое ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "Сервер выдал ошибку 404 для id {0}. Пропускаем" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 -#, java-format -msgid "Fetching a package of {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:414 +#, java-format +msgid "Fetching a package of ways from ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:415 +#, fuzzy, java-format +msgid "Fetching a package of relations from ''{0}''" +msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8106,34 +8910,34 @@ "каждого примитива" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 msgid "NMEA-0183 Files" msgstr "NMEA-0183 файлы" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Координаты импортированы: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Неправильно составленные предложения: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Ошибки контрольных сумм: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Неизвестные предложения: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Пустые координаты: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "Импорт NMEA успешно завершён" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "Сбой при импорте NMEA!" @@ -8144,9 +8948,9 @@ msgstr "отсутствует пункт настройки \"{0}\". Не могу инициализировать OsmApi" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 msgid "This version of JOSM is incompatible with the configured server." msgstr "Эта версия JOSM несовместима с настроенным сервером." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -8157,15 +8961,15 @@ "поддержке {0} до {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "Соединение с {0} установлено используя протокол {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:238 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "сервер вернул неожиданный формат id, текущее значение \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -8175,33 +8979,91 @@ "значение \"{1}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -msgid "Opening changeset..." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 +#, fuzzy +msgid "Creating changeset..." msgstr "Открывается список правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:316 +#, java-format +msgid "Successfully opened changeset {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 +msgid "No currently open changeset. Opening a new changeset..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310 +msgid "" +"Warning: could not reuse an existing changeset as requested. Opening a new " +"one." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318 +#, fuzzy, java-format +msgid "Reusing existing changeset {0}" +msgstr "Открывается список правок..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Открывается список правок..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:340 +#, java-format +msgid "Changeset {0} is unchanged. Skipping update." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#, fuzzy, java-format +msgid "Updating changeset {0}..." +msgstr "Открывается список правок..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +msgid "" +"Failed to update changeset. Either there is no current changeset or the id " +"of the current changeset is 0" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 msgid "Closing changeset..." msgstr "Закрывается список правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 +#, fuzzy, java-format +msgid "Closing changeset {0}..." +msgstr "Закрывается список правок..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Открывается список правок..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "No changeset present for diff upload" msgstr "Нет изменений для выгрузки" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "Preparing..." msgstr "Подготовка..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Закачка..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#, java-format +msgid "Starting retry {0} of {1} in {2} seconds ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:515 #, java-format msgid "Starting retry {0} of {1}." @@ -8229,42 +9091,50 @@ msgstr "bz2 файл содержит ошибки" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Неправильный пароль или имя пользователя." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168 msgid "Warning: The password is transferred unencrypted." msgstr "Внимание: Пароль будет передан в незашифрованном виде." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172 msgid "Save user and password (unencrypted)" msgstr "Сохранить имя пользователя и пароль (не зашифровано)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Введите пароль" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Идентификатор пользователя" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242 +msgid "The base URL for the OSM server (REST API)" +msgstr "Основной адрес сервера OSM (REST API)" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." msgstr "Логин (e-mail) учётной записи OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244 msgid "" "Login password to the OSM account. Leave blank to not store any password." msgstr "Пароль учётной записи OSM. Оставьте пустым, чтобы не сохранять пароль." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "Основной адрес сервера" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "Имя пользователя на OSM (e-mail)" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249 msgid "OSM password" msgstr "OSM пароль" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 msgid "" "WARNING: The password is stored in plain text in the preferences file." @@ -8272,24 +9142,24 @@ "URL.
Do not use a valuable Password." msgstr "" -"ВНИМАНИЕ: Пароль хранится открытым текстом в файле настроек.
Пароль " -"передаётся на сервер открытым текстом составной частью URL.
Не " -"используйте ценные Пароли." - -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +"ВНИМАНИЕ: Пароль хранится открытым текстом, в файле настроек." +"
Пароль передаётся на сервер открытым текстом, закодированный в URL." +"
Не используйте важные Пароли.An error occurred while saving.
Error is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +msgstr "Произошла ошибка при сохранении.
Ошибка:
{0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8297,6 +9167,8 @@ "html>" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +"Произошла ошибка при восстановлении резервной копии файла.
Ошибка: " +"
{0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8507,35 +9379,46 @@ "соединение." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:104 +#, fuzzy, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" 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 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:105 +#, fuzzy, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" +msgstr "{0}% ({1}/{2}), {3} осталось. Загрузка {4}: {5} (id: {6})" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:106 +#, fuzzy, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" +msgstr "{0}% ({1}/{2}), {3} осталось. Загрузка {4}: {5} (id: {6})" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189 #, java-format msgid "" "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to " -"use changesets, but API is not able to handle them. Ignoring changesets." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +"use diff uploads, but API is not able to handle them. Ignoring diff upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:194 +#, fuzzy +msgid "Starting to upload in one request ..." +msgstr "Нечего загружать. Сначала создайте данные." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 +msgid "Starting to upload with one request per primitive ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update Plugins" msgstr "Обновить модули" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Скачать модули" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54 #, java-format msgid "" @@ -8548,5 +9431,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -8556,23 +9439,23 @@ msgstr[2] "{0} Плагины успешно загружены. Пожалуйста, перезагрузите JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75 #, java-format msgid "Downloading Plugin {0}..." msgstr "Загрузка Плагина {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 msgid "Skip download" msgstr "Пропустить загрузку" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "JOSM версии {0} требует плагин {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Download Plugin" msgstr "Загрузить Плагин" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Skip Download" msgstr "Пропустить Загрузку" @@ -8583,30 +9466,30 @@ msgstr "В модуле {0} произошла ошибка" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:70 #, java-format msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:90 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "Плагин {0} требует обновление JOSM до версии {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108 #, 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:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123 #, java-format msgid "Plugin not found: {0}." msgstr "Модуль не найден : {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Последнее обновление модулей более {0} дней назад" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:142 msgid "" "(You can change the number of days after which this warning appears
by " @@ -8616,21 +9499,21 @@ "предупреждение, установив параметр настроек 'pluginmanager.warntime'.)" -#: ../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 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:175 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Disable plugin" msgstr "Отключить модуль" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Невозможно загрузить модуль {0}. Удалить из настроек?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 msgid "Keep plugin" msgstr "Сохранение плагина" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -8640,5 +9523,5 @@ "разрешение переписывать существующие модули." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8646,10 +9529,10 @@ msgstr "Произошла неожиданная ошибка. Возможно, она вызвана модулем ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:285 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Согласно информации в модуле, автором является {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -8658,9 +9541,9 @@ "ошибке." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290 msgid "Should the plugin be disabled?" msgstr "Отключить модуль?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:299 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -8670,13 +9553,13 @@ "модуль." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "The plugin could not be removed. Probably it was already disabled" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 msgid "Plugin information" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:355 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" @@ -8687,5 +9570,5 @@ msgstr "Подробнее" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -8695,18 +9578,18 @@ msgstr[2] "Скачать информацию о модуле с {0} сайтов" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Информации о модулях не найдено." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "Plug-in named {0} is not available. Update skipped." msgstr "Плагин {0} не доступен. Обновление пропущено." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93 msgid "All installed plugins are up to date." msgstr "Все установленные модули имеют последнюю версию." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8719,9 +9602,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 msgid "Download missing plugins" msgstr "Скачивание недостающих модулей" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8734,35 +9617,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Версия {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 msgid "Plugin bundled with JOSM" msgstr "Модуль из поставки JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Ошибка чтения файла с описанием модуля: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:301 msgid "This is after the end of the recording" msgstr "Это позже конца записи" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Ошибка при воспроизведении звука" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Ничего не делать" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Сообщить об ошибке" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8776,14 +9659,14 @@ "последней версией JOSM, будьте добры, отправьте отчёт об ошибке." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Неожиданная ошибка" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 #, java-format msgid "Please report a ticket at {0}" msgstr "Пожалуйста, создайте отчёт об ошибке по адресу {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -8791,5 +9674,5 @@ "подробнее!)" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -8799,19 +9682,19 @@ "ошибке." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "Be sure to include the following information:" msgstr "Прикрепите следующую информацию к отчёту:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 msgid "(The text has already been copied to your clipboard.)" msgstr "(Текст уже скопирован в буфер обмена)" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120 #, 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 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182 #, java-format msgid "" @@ -8820,5 +9703,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8827,5 +9710,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8838,5 +9721,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 msgid "" "This action will have no shortcut.\n" @@ -8846,5 +9729,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8855,21 +9738,56 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Подсказка: Горячие клавиши можно назначить в настройках программы)" -#: ../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 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:56 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:75 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:87 #, 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 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:60 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:80 #, java-format msgid "" "Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " "was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#, java-format +msgid "" +"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window " +"geometry from preferences." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#, java-format +msgid "" +"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got " +"{2}. Can''t restore window geometry from preferences." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#, java-format +msgid "" +"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: " +"{2}. Can''t restore window geometry from preferences." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#, java-format +msgid "" +"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry " +"from preferences." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#, java-format +msgid "" +"Warning: failed to restore window geometry from key ''{0}''. Falling back to " +"default geometry. Details: {1}" msgstr "" @@ -8898,9 +9816,27 @@ msgstr "Создание сетки линий" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:59 +msgid "Private (only shared as anonymous, unordered points)" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:60 +msgid "Public (shown in trace list and as anonymous, unordered points)" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:61 +msgid "Trackable (only shared as anonymous, ordered points with timestamps)" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:62 +msgid "" +"Identifiable (shown in trace list and as identifiable, ordered points with " +"timestamps)" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 msgid "Upload Trace" msgstr "Загрузка трэка" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -8908,27 +9844,40 @@ msgstr "Загрузка трэков" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Публичный" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in openstreetmap.org" -msgstr "Выбор сделает ваш трэк общественным на сайте openstreetmap.org" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:134 +msgid "Visibility" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135 +msgid "Defines the visibility of your trace for other OSM users." +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139 +#, fuzzy +msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" +msgstr "http://www.openstreetmap.org/traces" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139 +msgid "(What does that mean?)" +msgstr "" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 -#: build/trans_presets.java:3017 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:141 +#: build/trans_presets.java:3145 msgid "Description" msgstr "Описание" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 msgid "Please enter Description about your trace." msgstr "Пожалуйста введите описание вашего трэка" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:144 +msgid "Tags (comma delimited)" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145 msgid "Please enter tags about your trace." msgstr "Введите теги описывающие ваш трэк." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:192 #, java-format msgid "Selected track: {0}" @@ -8936,47 +9885,47 @@ #. Set progress dialog to indeterminate while connecting -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:215 msgid "Connecting..." msgstr "Подключение..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 msgid "Upload cancelled" msgstr "Загрузка отменена" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:248 msgid "Error while uploading" msgstr "Ошибка во время загрузки" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:302 msgid "GPX upload was successful" msgstr "Загрузка GPX успешно закончена" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 msgid "Upload failed. Server returned the following message: " msgstr "Загрузка прервалась. Сервер ответил следующим сообщением: " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 #, 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:335 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 msgid "No description provided. Please provide some description." msgstr "Нет описания. Просьба представить некоторое описание." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:380 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:402 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Слой GPX не выбран. Не удается загрузить трэк." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:383 msgid "No username provided." msgstr "Нет имени пользователя" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:386 msgid "No password provided." msgstr "Нет пароля" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:418 msgid "Uploading GPX Track" msgstr "Загрузка GPX трэка" @@ -9089,19 +10038,19 @@ msgstr "Загрузить набор изображений на новый слой." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:130 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "Файлы GPX (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 #, 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:176 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:175 #, java-format msgid "Error while parsing {0}" msgstr "Ошибка разбора {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -9113,34 +10062,34 @@ "прочитаете на фото и выберите часовой пояс
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:241 msgid "Photo time (from exif):" msgstr "Время фотоснимка (из EXIF):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:256 msgid "Gps time (read from the above photo): " msgstr "Время GPS (прочтите на фото вверху): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:268 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [дд/мм/гггг чч:мм:сс]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:276 msgid "I'm in the timezone of: " msgstr "Я нахожусь в часовом поясе: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:339 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:375 msgid "No date" msgstr "Без даты" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:348 msgid "Open an other photo" msgstr "Открыть другое фото" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:389 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Синхронизация времени с фотографией GPS-приемника" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:403 msgid "" "Error while parsing the date.\n" @@ -9150,70 +10099,70 @@ "Пожалуйста, используйте запрашиваемый формат" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:405 msgid "Invalid date" msgstr "Недопустимая дата" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "<Не загружены треки GPX>" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:454 msgid "GPX track: " msgstr "Трек GPX: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:459 msgid "Open another GPX trace" msgstr "Открыть другой трек GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:475 msgid "Timezone: " msgstr "Часовой пояс: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:497 msgid "Offset:" msgstr "Смещение:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:509 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:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:526 msgid "Update position for: " msgstr "Обновление позиции для: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:535 msgid "All images" msgstr "Все изображения" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:545 msgid "Images with no exif position" msgstr "Изображения без координат в заголовках Exif" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:555 msgid "Not yet tagged images" msgstr "Картинки без ярлыков" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:575 msgid "Correlate images with GPX track" msgstr "Сопоставить изображения с GPX треком" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 msgid "Correlate" msgstr "Совпадения" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 msgid "Auto-Guess" msgstr "Авто-Угадывание" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:587 msgid "You should select a GPX track" msgstr "Необходимо выбрать трек GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "No selected GPX track" msgstr "Не выбрано трека GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:600 #, java-format msgid "" @@ -9224,9 +10173,9 @@ "Ожидаемый формат: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 msgid "Invalid timezone" msgstr "Недопустимый часовой пояс" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:613 #, java-format msgid "" @@ -9237,26 +10186,26 @@ "Ожидаемый формат: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 msgid "Invalid offset" msgstr "Недопустимое смещение" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:657 #, 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:659 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 msgid "GPX Track loaded" msgstr "Трек GPX загружен" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:693 msgid "The selected photos don't contain time information." msgstr "ыбранные фотографии не содержат информацию о времени." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "Photos don't contain time information" msgstr "Фотографии не содержать информацию о времени" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:728 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." @@ -9264,39 +10213,39 @@ "Точки в выбранном GPX треке не содержат времени. Пожалуйста, выберите другой." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:729 msgid "GPX Track has no time information" msgstr "GPX трек не содержит информации о времени" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774 #, java-format msgid "Timezone: {0}" msgstr "Часовой пояс: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775 #, java-format msgid "Minutes: {0}" msgstr "Минуты: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Seconds: {0}" msgstr "Секунды: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:793 #, 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:798 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:796 #, java-format msgid "(Time difference of {0} days)" msgstr "(Разница во времени {0} дней)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:803 #, 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:867 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:865 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -9306,13 +10255,13 @@ "можете вручную сопоставить фотографии использую ползунки." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "Matching photos to track failed" msgstr "Сопоставление фотографий треку прервано" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:883 msgid "Adjust timezone and offset" msgstr "Настройка часового пояса и смещения" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Default Values" msgstr "Значения по умолчанию" @@ -9333,5 +10282,5 @@ msgstr "Ошибка в файле {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9344,12 +10293,11 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:89 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:382 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386 msgid "Select Feuille" -msgstr "Выбрать всё" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:126 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "Error loading file" msgstr "Ошибка при загрузке файла" @@ -9378,8 +10326,8 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, java-format -msgid "" -"Town/city {0} not found or not available in WMS.\n" -"Please check its availibility on www.cadastre.gouv.fr" +#, fuzzy, java-format +msgid "" +"Town/city {0} not found or not available\n" +"or action canceled" msgstr "" "Город {0} не найден или не сдоступен в WMS.\n" @@ -9390,21 +10338,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:361 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:365 msgid "Select commune" msgstr "Выберите коммуну" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:350 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354 msgid "Choose from..." msgstr "Выбрать из..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 msgid "Cadastre" msgstr "Кадастр" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Auto sourcing" msgstr "Авто источники" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -9413,37 +10361,48 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:198 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:269 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 msgid "Replace original background by JOSM background color." msgstr "Заменить оригинальный фон JOSM на цвет фона." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 msgid "Reverse grey colors (for black backgrounds)." msgstr "Обратить серые цвета (для черного фона)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 msgid "Set background transparent." msgstr "Установить прозрачный фон." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 msgid "Draw boundaries of downloaded data." msgstr "Нарисовать границы загруженных данных." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:174 +msgid "Disable image cropping during georeferencing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Enable automatic caching." msgstr "Включить автоматическое кеширование." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 msgid "Max. cache size (in MB)" msgstr "Макс. размер кеша (МБ)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:61 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -9461,18 +10420,18 @@ "созданный этим плагином ." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "WMS французского кадастра" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "Значение тэга \"source\" когда включенs автоисточники" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "Source" msgstr "Источник" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:172 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -9481,5 +10440,5 @@ "Заменить оригинальный белый фон на цвет фона, определенные в настройках JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -9489,43 +10448,41 @@ "Полезно для текстов на темном фоне." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 msgid "Allows multiple layers stacking" msgstr "Позволяет соединять несколько слоев" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" "Установить прозрачность слоев WMS. С право непрозрачный, слева прозрачный." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Нарисовать прямоугольник вокруг загруженных данных с сервера WMS." #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:115 msgid "Vector images grab multiplier:" -msgstr "Множитель скачанного изображения" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:128 +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:130 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" "Взять мелкие изображения (высокое качество, но использует больше памяти)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:138 msgid "Fixed size square (default is 100m)" msgstr "Фиксированный размер площади (по умолчанию 100 м)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Фиксированный размер (от 25 до 1000 метров)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Raster images grab multiplier:" -msgstr "Множитель скачанного изображения" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "Более старые файлы автоматически удаляются, когда этот размер превышен" @@ -9583,12 +10540,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Соединение с WMS Server..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "изображение не загружено" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9622,20 +10577,20 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:85 msgid "" "To enable the cadastre WMS plugin, change\n" "the current projection to one of the cadastre\n" -"projection and retry" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:44 +"projections and retry" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47 msgid "Grab non-georeferenced image" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:68 msgid "Georeferencing interrupted" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:157 msgid "" "Click first corner for image cropping\n" @@ -9643,9 +10598,15 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177 +#, fuzzy +msgid "Image cropping" +msgstr "изображение загружается..." + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176 msgid "Click second corner for image cropping" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:123 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:196 msgid "" "Click first Lambert crosspiece for georeferencing\n" @@ -9653,31 +10614,39 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:132 -msgid "Click second Lambert crosspiece for georeferencing\n" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:148 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:216 +msgid "Image georeferencing" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:215 +msgid "Click second Lambert crosspiece for georeferencing" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:233 +msgid "" +"Do you want to cancel completely\n" +"or just retry " +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:249 +msgid "Enter cadastre east,north position" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 +msgid "(Warning: verify north with arrow !!)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:252 +msgid "East" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:253 +msgid "North" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 #, fuzzy -msgid "Enter cadastre east,north position" -msgstr "Введите Lat / Lon, чтобы перейти к позиции." - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:149 -msgid "(Warning: verify north with arrow !!)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151 -#, fuzzy -msgid "East" -msgstr "восток" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy -msgid "North" -msgstr "север" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 -#, fuzzy -msgid "Set Lambert coordinate" -msgstr "Оставить их координаты" +msgid "Set " +msgstr "Выбор" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9742,6 +10711,6 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:62 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:137 #, java-format msgid "Simplify Way (remove {0} node)" @@ -9766,6 +10735,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166 msgid "Blank Layer" msgstr "Пустой слой" @@ -9781,7 +10750,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Центр растра: {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10306,6 +11275,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 #: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3441 -#: build/trans_style.java:3449 +#: build/trans_style.java:1023 build/trans_style.java:3392 +#: build/trans_style.java:3400 msgid "water" msgstr "вода" @@ -10318,8 +11287,4 @@ msgid "land" msgstr "земля" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "ничего" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10616,9 +11581,9 @@ msgstr "Цикл скачивания из OpenStreetBugs" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:108 msgid "Displays OpenStreetBugs issues" msgstr "Отображает проблемы из OpenStreetBugs" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" "The openstreetbus plugin is using the old server at appspot.com.
A " @@ -10630,5 +11595,5 @@ "(Строго рекомендуется)" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97 msgid "Switch to new openstreetbugs server?" msgstr "Переключится на новый сервер openstreetbugs?" @@ -11208,5 +12173,5 @@ #. item "Buildings/Addresses" text "House name" #: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2192 +#: build/trans_presets.java:2261 msgid "Street name" msgstr "Название улицы" @@ -11225,29 +12190,29 @@ msgstr "Показать панель автора" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89 msgid "Open User Page" msgstr "Открыть страницу пользователя" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90 msgid "Open User Page in browser" msgstr "Открыть страницу пользователя в браузере" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103 msgid "Select User's Data" msgstr "Выбрать данные пользователя" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104 msgid "Replaces Selection with Users data" msgstr "Заменить выбранное данными пользователя" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130 msgid "Please select some data" msgstr "Пожалуйста, выберите данные" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134 msgid "Please choose a user using the author panel" msgstr "Пожалуйста, выберите пользователя в панели авторов" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147 msgid "Sorry, doesn't work with anonymous users" msgstr "Извините, для анонимных пользователей это недоступно" @@ -11261,25 +12226,15 @@ msgstr "Объединить области, накладывающиеся друг на друга" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 -msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -msgstr "" -"ЭТО ЭКСПЕРИМЕНТАЛЬНАЯ ВОЗМОЖНОСТЬ. Сохраните вашу работу и проверьте перед " -"загрузкой." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 -msgid "Continue anyway" -msgstr "Продолжить в любом случае" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:134 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127 msgid "Only up to two areas can be joined at the moment." msgstr "Только два района могут быть объединены в данный момент." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:139 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "\"{0}\" не замкнут, и поэтому они не могут быть объединены." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:156 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:149 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:65 msgid "" "The selected way(s) have nodes outside of the downloaded data region.\n" @@ -11291,10 +12246,10 @@ "Действительно продолжить?" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:159 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "Пожалуйста, остановитесь, если вы не уверены" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:173 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166 msgid "Please select at least one closed way the should be joined." msgstr "" @@ -11302,29 +12257,29 @@ "быть объединены." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:181 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174 msgid "No intersection found. Nothing was changed." msgstr "Пересечений не найдено. Изменений сделано не было." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:203 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196 msgid "Added node on all intersections" msgstr "Добавлены узлы на всех пересечениях" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:227 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Удалить линии, которые не являются частью внутреннего мультиполигона" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225 msgid "Fix relations" msgstr "Исправить отношения" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230 msgid "Joined self-overlapping area" msgstr "Присоединить самоперекрывающиеся области" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:238 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 msgid "Joined overlapping areas" msgstr "Присоединить перекрывающиеся области" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:242 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -11334,62 +12289,62 @@ "Пожалуйста, проверьте не появились ли ошибки." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Инсправить конфликт тегов" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:465 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 msgid "Removed Element from Relations" msgstr "Удалить Элементы из Отношений" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:574 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 msgid "Join Areas: Remove Short Ways" msgstr "Присоединить районы: удаление коротких путей" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:590 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 msgid "Closed Way" msgstr "Замкнутая линия" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:857 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 msgid "Remove tags from inner ways" msgstr "Удаление тегов у внутренних линий" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:886 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 msgid "Join Areas Function" msgstr "Присоединить районы функционирования" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 msgid "Jump To Position" msgstr "Перейти на позицию" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 msgid "Opens a dialog that allows to jump to a specific location" msgstr "" "Открывает диалоговое окно, которое позволяет перейти к определенной местности" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 msgid "Enter Lat/Lon to jump to position." msgstr "Введите Lat / Lon, чтобы перейти к позиции." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "Вы также можете вставить URL из www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 msgid "Zoom (in metres)" msgstr "Приближение (в метрах)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 msgid "Jump there" msgstr "Перейти туда" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 msgid "Jump to Position" msgstr "Перейти к позиции" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" @@ -11397,21 +12352,21 @@ "проверьте." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 msgid "Unable to parse Lon/Lat" msgstr "Невозможно разобрать широту/долготу" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Simplify Way" msgstr "Упростить линию" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." msgstr "Удалить из линии ненужные точки." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 msgid "Please select at least one way to simplify." msgstr "Выберите хотя бы один путь для упрощения." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:87 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:88 #, java-format msgid "The selection contains {0} way. Are you sure you want to simplify it?" @@ -11427,25 +12382,25 @@ "все?" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "Вы уверены?" -#: ../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:74 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:92 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:72 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 msgid "Validation errors" msgstr "Ошибки при проверке" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:90 msgid "No validation errors" msgstr "Проверка не выявила ошибок" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:165 msgid "Grid" msgstr "Сетка" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #, java-format msgid "" @@ -11536,53 +12491,53 @@ msgstr "Произвести проверку данных" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 msgid "Data with errors. Upload anyway?" msgstr "Данные содержат ошибки. Всё равно продолжить?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:72 msgid "Open the validation window." msgstr "Открыть окно проверки" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:79 msgid "Zoom to problem" msgstr "Показать проблему" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 msgid "Fix" msgstr "Исправить" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 msgid "Fix the selected errors." msgstr "Исправить выбранные ошибки." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104 msgid "Ignore" msgstr "Игнорировать" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:107 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Ignore the selected errors next time." msgstr "Игнорировать выбранные ошибки в будущем." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188 msgid "Whole group" msgstr "Всю группу" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188 msgid "Single elements" msgstr "Отдельные элементы" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188 msgid "Nothing" msgstr "Ничего" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:193 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:189 msgid "Ignore whole group or individual elements?" msgstr "Игнорировать всю группу, или отдельные элементы?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:190 msgid "Ignoring elements" msgstr "Игнорировать элементы" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 #, java-format msgid "Replace \"{0}\" by \"{1}\" for" @@ -11606,23 +12561,56 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -msgid "" -"This test checks if two roads, railways or waterways crosses in the same " -"layer, but are not connected by a node." +#, fuzzy +msgid "" +"This test checks if two roads, railways, waterways or buildings crosses in " +"the same layer, but are not connected by a node." msgstr "" "Данный тест проверяет, если две линии (дороги, железные дороги, водоёмы) " "пересекаются на одном слое, но не имеют общей точки." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:118 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 +#, fuzzy +msgid "Crossing buildings" +msgstr "Создание зданий" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 msgid "Crossing ways" msgstr "Пересекающиеся линии" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:72 msgid "Duplicated nodes" msgstr "Дублированные узлы" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:43 msgid "This test checks that there are no nodes at the very same location." msgstr "Этот тест проверяет, чтобы не было совпадения узлов." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 +#, fuzzy +msgid "Nodes at same position" +msgstr "Точки с одинаковыми названиями" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgid "Confirmation" +msgstr "Подтверждение" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76 +#, fuzzy +msgid "Duplicated ways" +msgstr "Дубликат линии" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 +#, fuzzy +msgid "" +"This test checks that there are no ways with same tags and same node " +"coordinates." +msgstr "Этот тест проверяет, чтобы не было совпадения узлов." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 +#, fuzzy +msgid "Delete duplicate ways" +msgstr "Создать копию линии" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11709,24 +12697,24 @@ "Этот тест ищет линии с похожими названиями. Возможно, это вызвано опечатками." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 msgid "Properties checker :" msgstr "Проверка параметров:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "This plugin checks for errors in property keys and values." msgstr "" "Этот плагин проверяет на наличие ошибок в названиях ключей и их значений." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Неправильно просталенныех тегов линиий - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Ошибка проверки правописания строки: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 #, java-format msgid "" @@ -11737,7 +12725,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:427 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 msgid "Illegal tag/value combinations" msgstr "Неправильная комбинация тегов/значений тегов" @@ -11745,80 +12733,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:448 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 msgid "Painting problem" msgstr "Проблемы отображения" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 #, java-format msgid "Key ''{0}'' invalid." msgstr "Неправильный ключ {0}." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 msgid "Tags with empty values" msgstr "Пустые значения тегов" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 msgid "Invalid property key" msgstr "Неверный ключ свойств" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 msgid "Invalid white space in property key" msgstr "Неправильный пробел в названии ключа" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 msgid "Property values start or end with white space" msgstr "Значение начинается или заканчивается пробелом" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 msgid "Property values contain HTML entity" msgstr "Значения содержат HTML разметку" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Ключа ''{0}'' нет в настройках." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 msgid "Presets do not contain property key" msgstr "Установки не содержат собственно ключа" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 #, 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:537 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 msgid "Presets do not contain property value" msgstr "Не содержит зарание устанвленного значения" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 msgid "Check property keys." msgstr "Проверьте ключи свойств." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Validate that property keys are valid checking against list of words." msgstr "Проверьте, что ключ действителен проверен в отношении списка слов." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 msgid "Use complex property checker." msgstr "Использовать сложную проверку" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Validate property values and tags using complex rules." msgstr "Проверка собственных значений и использование сложных правил тегов." +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623 #: ../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:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 #: ../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:687 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -11828,21 +12816,21 @@ "openstreetmap.org/index.php/User:JLS/speller) или тег проверки файлов данных." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "Add a new source to the list." msgstr "Добавить в список новый источник." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Edit the selected source." msgstr "Править выбранный источник." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691 msgid "Data sources" msgstr "Источники данных" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711 msgid "Check property values." msgstr "Проверьте правильно значений" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Validate that property values are valid checking against presets." msgstr "" @@ -11850,41 +12838,41 @@ "установок проверки." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719 msgid "Check for FIXMES." msgstr "Проверить для FIXMES." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 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:728 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check for paint notes." msgstr "Проверить заметки." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check if map painting found data errors." msgstr "Проверить содержит ли нарисованная карта ошибки данных" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Use default data file." msgstr "Использовать файл данных по умолчанию." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use the default data file (recommended)." msgstr "Используется файл данных установленный по умолчанию" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739 +msgid "Use default tag ignore file." +msgstr "" + #: ../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:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Use default spellcheck file." msgstr "Использовать установленный по умолчанию файл проверки правописания" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use the default spellcheck file (recommended)." msgstr "" @@ -11892,22 +12880,22 @@ "(рекомендуется)" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838 msgid "Fix properties" msgstr "Исправить параметры" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959 msgid "Could not find element type" msgstr "Не удалось найти тип элемента" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976 msgid "Could not find warning level" msgstr "Не удалось найти уровень предупреждения" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985 #, java-format msgid "Illegal expression ''{0}''" msgstr "Недопустимое выражение ''{0}''" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 #, java-format msgid "Illegal regular expression ''{0}''" @@ -12052,7 +13040,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4192 build/trans_style.java:4199 -#: build/trans_style.java:4206 build/trans_style.java:4213 -#: build/trans_style.java:4220 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 +#: build/trans_style.java:4179 msgid "building" msgstr "здание" @@ -12066,5 +13054,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4227 +#: build/trans_style.java:4186 msgid "area" msgstr "область" @@ -12203,5 +13191,5 @@ msgstr "Достигнут перекрёсток" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "Произошла ошибка." @@ -12268,14 +13256,14 @@ msgstr "Справка по модулю WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 msgid "Rectified Image..." msgstr "Трансформированное изображение..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 msgid "Download Rectified Images From Various Services" msgstr "Загрузить привязанные изображения с различных сервисов" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 #, java-format msgid "WMS: {0}" @@ -12286,26 +13274,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:107 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 msgid "Custom WMS Link" msgstr "Индивидуальная ссылка WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 msgid "Visit Homepage" msgstr "Домашняя страница" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 msgid "WMS URL or Image ID:" msgstr "WMS URL или ID Изображения:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 msgid "Add Rectified Image" msgstr "Добавить привязанное изображение" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -12315,37 +13303,55 @@ "Пожалуйста попробуйте ещё раз." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "No valid WMS URL or id" msgstr "Нет верных WMS URL или ID" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 msgid "Adjust WMS" msgstr "Подстроить WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust the position of the selected WMS layer" msgstr "Отрегулируйте положение выбранного слоя WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 msgid "Start adjusting" msgstr "" +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190 +msgid "There are currently no WMS layer to adjust." +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191 -msgid "There are currently no WMS layer to adjust." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#, java-format +msgid "" +"Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing '&' " +"or a trailing '?'." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +msgid "" +"Warning: Fetching WMS tiles is likely to fail. Please check you preference " +"settings." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#, java-format +msgid "Warning: The complete URL is ''{0}''." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 #, java-format msgid "" @@ -12360,15 +13366,43 @@ msgstr "Автоматическое скачивание" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:94 +#, java-format +msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#, fuzzy +msgid "(deactivated)" +msgstr "предусмотрен" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#, java-format +msgid "" +"The base URL
''{0}''
for this WML layer does neither end with a " +"''&'' nor with a ''?''.
This is likely to lead to invalid WMS request. " +"You should check your
preference settings.
Do you want to fetch WMS " +"tiles anyway?" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 +msgid "Yes, fetch images" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:194 +#, fuzzy +msgid "Invalid URL?" +msgstr "Недопустимая дата" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -12377,37 +13411,37 @@ "измените разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 msgid "Download visible tiles" msgstr "Скачать видимые квадраты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Change resolution" msgstr "Изменить разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 msgid "Reload erroneous tiles" msgstr "Перезагрузить ошибочные фрагменты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 msgid "Alpha channel" msgstr "Альфа канал" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Save WMS layer to file" msgstr "Сохранить слой WMS в файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "Сохраниеть WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "Загрузить слой WMS из файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "Загрузить WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:392 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -12415,53 +13449,65 @@ "Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 msgid "File Format Error" msgstr "Ошибка формата файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166 msgid "Open a blank WMS layer to load data from a file" msgstr "Открыть пустой WMS-слой для загрузки данных из файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "Настройки модуля WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "Измениить список серверов WMS, отображаемых в меню модуля WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 msgid "Menu Name" msgstr "Название меню" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "WMS URL" msgstr "Ссылка на WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "Menu Name (Default)" msgstr "Имя пункта меню (по умолчанию)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "WMS URL (Default)" msgstr "WMS URL (по умолчанию)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "Введите имя пункта меню и URL этого WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" -msgstr "Копия поумолчанию" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" +msgstr "Копировать умолчания" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Пожалуйста, выберите как минимум одну линию." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 msgid "Downloader:" msgstr "Загрузчик" + +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 +#, fuzzy +msgid "WMS Files (*.wms)" +msgstr "Файлы TCX (*.tcx)" #. * @@ -12872,62 +13918,7 @@ #: build/trans_presets.java:120 build/trans_presets.java:140 #: build/trans_presets.java:177 build/trans_presets.java:197 -#: build/trans_presets.java:1545 build/trans_presets.java:3015 +#: build/trans_presets.java:1557 build/trans_presets.java:3143 msgid "Reference" msgstr "Сноска" - -#. item "Streets/Motorway" text "Name" -#. item "Streets/Motorway Link" label "Edit Motorway Link" -#. -#. -#. -#. item "Streets/Trunk" text "Name" -#. item "Streets/Trunk Link" text "Reference" -#. -#. item "Streets/Primary" text "Name" -#. item "Streets/Primary Link" label "Edit Primary Link" -#. -#. -#. -#. item "Streets/Secondary" text "Name" -#. item "Streets/Tertiary" text "Name" -#. item "Streets/Unclassified" check "Embankment" -#. item "Streets/Residential" check "Embankment" -#. item "Streets/Living Street" check "Embankment" -#. item "Streets/Service" check "Embankment" -#. item "Streets/Road (Unknown Type)" check "Embankment" -#. item "Streets/Roundabout" check "Embankment" -#. item "Streets/Bridge" text "Name" -#. item "Streets/Tunnel" text "Name" -#. item "Ways/Construction" check "Embankment" -#. item "Ways/Bridleway" check "Embankment" -#. item "Ways/Cycleway" check "Embankment" -#. item "Ways/Footway" check "Embankment" -#. item "Ways/Pedestrian" check "Embankment" -#. item "Ways/Steps" check "Embankment" -#. item "Ways/Path" check "Embankment" -#. item "Water/Drain" text "Name" -#. item "Water/Stream" text "Name" -#. item "Water/Canal" text "Name" -#. item "Water/River" text "Name" -#. item "Railway/Bus Guideway" check "Embankment" -#: build/trans_presets.java:67 build/trans_presets.java:84 -#: build/trans_presets.java:103 build/trans_presets.java:122 -#: build/trans_presets.java:143 build/trans_presets.java:159 -#: build/trans_presets.java:180 build/trans_presets.java:200 -#: build/trans_presets.java:223 build/trans_presets.java:241 -#: build/trans_presets.java:259 build/trans_presets.java:278 -#: build/trans_presets.java:311 build/trans_presets.java:356 -#: build/trans_presets.java:371 build/trans_presets.java:386 -#: build/trans_presets.java:408 build/trans_presets.java:428 -#: build/trans_presets.java:448 build/trans_presets.java:467 -#: build/trans_presets.java:486 build/trans_presets.java:505 -#: build/trans_presets.java:525 build/trans_presets.java:546 -#: build/trans_presets.java:567 build/trans_presets.java:588 -#: build/trans_presets.java:609 build/trans_presets.java:630 -#: build/trans_presets.java:659 build/trans_presets.java:1055 -#: build/trans_presets.java:1063 build/trans_presets.java:1071 -#: build/trans_presets.java:1081 build/trans_presets.java:1300 -msgid "Layer" -msgstr "Слой" #. item "Streets/Motorway" combo "Layer" @@ -12942,5 +13933,5 @@ #: build/trans_presets.java:104 build/trans_presets.java:123 #: build/trans_presets.java:144 build/trans_presets.java:160 -#: build/trans_presets.java:181 build/trans_presets.java:357 +#: build/trans_presets.java:181 build/trans_presets.java:358 msgid "Lanes" msgstr "Полосы" @@ -12955,5 +13946,4 @@ #. item "Streets/Tertiary" combo "Layer" #. item "Streets/Unclassified" combo "Layer" -#. item "Streets/Road (Unknown Type)" combo "Layer" #. item "Streets/Bridge" combo "Layer" #. item "Streets/Tunnel" combo "Layer" @@ -12963,10 +13953,10 @@ #: build/trans_presets.java:182 build/trans_presets.java:201 #: build/trans_presets.java:224 build/trans_presets.java:280 -#: build/trans_presets.java:312 build/trans_presets.java:333 -#: build/trans_presets.java:372 build/trans_presets.java:387 -#: build/trans_presets.java:411 build/trans_presets.java:430 -#: build/trans_presets.java:450 build/trans_presets.java:469 -#: build/trans_presets.java:507 build/trans_presets.java:661 -#: build/trans_presets.java:1302 +#: build/trans_presets.java:313 build/trans_presets.java:334 +#: build/trans_presets.java:373 build/trans_presets.java:388 +#: build/trans_presets.java:412 build/trans_presets.java:431 +#: build/trans_presets.java:452 build/trans_presets.java:472 +#: build/trans_presets.java:510 build/trans_presets.java:666 +#: build/trans_presets.java:1307 msgid "Max. speed (km/h)" msgstr "Макс. скорость (км/ч)" @@ -13010,9 +14000,9 @@ #: build/trans_presets.java:254 build/trans_presets.java:273 #: build/trans_presets.java:293 build/trans_presets.java:306 -#: build/trans_presets.java:319 build/trans_presets.java:351 -#: build/trans_presets.java:403 build/trans_presets.java:423 -#: build/trans_presets.java:443 build/trans_presets.java:462 -#: build/trans_presets.java:481 build/trans_presets.java:500 -#: build/trans_presets.java:654 build/trans_presets.java:1295 +#: build/trans_presets.java:320 build/trans_presets.java:352 +#: build/trans_presets.java:404 build/trans_presets.java:424 +#: build/trans_presets.java:444 build/trans_presets.java:464 +#: build/trans_presets.java:484 build/trans_presets.java:503 +#: build/trans_presets.java:659 build/trans_presets.java:1300 msgid "Oneway" msgstr "Односторонняя" @@ -13060,13 +14050,13 @@ #: build/trans_presets.java:219 build/trans_presets.java:237 #: build/trans_presets.java:255 build/trans_presets.java:274 -#: build/trans_presets.java:307 build/trans_presets.java:352 -#: build/trans_presets.java:361 build/trans_presets.java:404 -#: build/trans_presets.java:424 build/trans_presets.java:444 -#: build/trans_presets.java:463 build/trans_presets.java:482 -#: build/trans_presets.java:501 build/trans_presets.java:520 -#: build/trans_presets.java:541 build/trans_presets.java:562 -#: build/trans_presets.java:583 build/trans_presets.java:604 -#: build/trans_presets.java:625 build/trans_presets.java:655 -#: build/trans_presets.java:1296 build/trans_surveyor.java:12 +#: build/trans_presets.java:307 build/trans_presets.java:353 +#: build/trans_presets.java:362 build/trans_presets.java:405 +#: build/trans_presets.java:425 build/trans_presets.java:445 +#: build/trans_presets.java:465 build/trans_presets.java:485 +#: build/trans_presets.java:504 build/trans_presets.java:523 +#: build/trans_presets.java:544 build/trans_presets.java:565 +#: build/trans_presets.java:586 build/trans_presets.java:607 +#: build/trans_presets.java:628 build/trans_presets.java:660 +#: build/trans_presets.java:1301 build/trans_surveyor.java:12 msgid "Bridge" msgstr "Мост" @@ -13108,13 +14098,13 @@ #: build/trans_presets.java:220 build/trans_presets.java:238 #: build/trans_presets.java:256 build/trans_presets.java:275 -#: build/trans_presets.java:308 build/trans_presets.java:353 -#: build/trans_presets.java:377 build/trans_presets.java:405 -#: build/trans_presets.java:425 build/trans_presets.java:445 -#: build/trans_presets.java:464 build/trans_presets.java:483 -#: build/trans_presets.java:502 build/trans_presets.java:521 -#: build/trans_presets.java:542 build/trans_presets.java:563 -#: build/trans_presets.java:584 build/trans_presets.java:605 -#: build/trans_presets.java:626 build/trans_presets.java:656 -#: build/trans_presets.java:1297 +#: build/trans_presets.java:308 build/trans_presets.java:354 +#: build/trans_presets.java:378 build/trans_presets.java:406 +#: build/trans_presets.java:426 build/trans_presets.java:446 +#: build/trans_presets.java:466 build/trans_presets.java:486 +#: build/trans_presets.java:505 build/trans_presets.java:524 +#: build/trans_presets.java:545 build/trans_presets.java:566 +#: build/trans_presets.java:587 build/trans_presets.java:608 +#: build/trans_presets.java:629 build/trans_presets.java:661 +#: build/trans_presets.java:1302 msgid "Tunnel" msgstr "Тоннель" @@ -13154,12 +14144,12 @@ #: build/trans_presets.java:221 build/trans_presets.java:239 #: build/trans_presets.java:257 build/trans_presets.java:276 -#: build/trans_presets.java:309 build/trans_presets.java:354 -#: build/trans_presets.java:406 build/trans_presets.java:426 -#: build/trans_presets.java:446 build/trans_presets.java:465 -#: build/trans_presets.java:484 build/trans_presets.java:503 -#: build/trans_presets.java:522 build/trans_presets.java:543 -#: build/trans_presets.java:564 build/trans_presets.java:585 -#: build/trans_presets.java:606 build/trans_presets.java:627 -#: build/trans_presets.java:657 build/trans_presets.java:1298 +#: build/trans_presets.java:309 build/trans_presets.java:355 +#: build/trans_presets.java:407 build/trans_presets.java:427 +#: build/trans_presets.java:447 build/trans_presets.java:467 +#: build/trans_presets.java:487 build/trans_presets.java:506 +#: build/trans_presets.java:525 build/trans_presets.java:546 +#: build/trans_presets.java:567 build/trans_presets.java:588 +#: build/trans_presets.java:609 build/trans_presets.java:630 +#: build/trans_presets.java:662 build/trans_presets.java:1303 msgid "Cutting" msgstr "Отсечь" @@ -13199,12 +14189,12 @@ #: build/trans_presets.java:222 build/trans_presets.java:240 #: build/trans_presets.java:258 build/trans_presets.java:277 -#: build/trans_presets.java:310 build/trans_presets.java:355 -#: build/trans_presets.java:407 build/trans_presets.java:427 -#: build/trans_presets.java:447 build/trans_presets.java:466 -#: build/trans_presets.java:485 build/trans_presets.java:504 -#: build/trans_presets.java:523 build/trans_presets.java:544 -#: build/trans_presets.java:565 build/trans_presets.java:586 -#: build/trans_presets.java:607 build/trans_presets.java:628 -#: build/trans_presets.java:658 build/trans_presets.java:1299 +#: build/trans_presets.java:310 build/trans_presets.java:356 +#: build/trans_presets.java:408 build/trans_presets.java:428 +#: build/trans_presets.java:448 build/trans_presets.java:468 +#: build/trans_presets.java:488 build/trans_presets.java:507 +#: build/trans_presets.java:526 build/trans_presets.java:547 +#: build/trans_presets.java:568 build/trans_presets.java:589 +#: build/trans_presets.java:610 build/trans_presets.java:631 +#: build/trans_presets.java:663 build/trans_presets.java:1304 msgid "Embankment" msgstr "Насыпь" @@ -13360,17 +14350,17 @@ #: build/trans_presets.java:225 build/trans_presets.java:243 #: build/trans_presets.java:261 build/trans_presets.java:281 -#: build/trans_presets.java:313 build/trans_presets.java:358 -#: build/trans_presets.java:374 build/trans_presets.java:388 -#: build/trans_presets.java:412 build/trans_presets.java:431 -#: build/trans_presets.java:451 build/trans_presets.java:470 -#: build/trans_presets.java:488 build/trans_presets.java:508 -#: build/trans_presets.java:529 build/trans_presets.java:550 -#: build/trans_presets.java:571 build/trans_presets.java:592 -#: build/trans_presets.java:613 build/trans_presets.java:634 -#: build/trans_presets.java:662 build/trans_presets.java:675 -#: build/trans_presets.java:688 build/trans_presets.java:701 -#: build/trans_presets.java:714 build/trans_presets.java:727 -#: build/trans_presets.java:740 build/trans_presets.java:1303 -#: build/trans_presets.java:1486 build/trans_presets.java:1528 +#: build/trans_presets.java:314 build/trans_presets.java:359 +#: build/trans_presets.java:375 build/trans_presets.java:389 +#: build/trans_presets.java:413 build/trans_presets.java:432 +#: build/trans_presets.java:453 build/trans_presets.java:473 +#: build/trans_presets.java:491 build/trans_presets.java:511 +#: build/trans_presets.java:532 build/trans_presets.java:553 +#: build/trans_presets.java:574 build/trans_presets.java:595 +#: build/trans_presets.java:616 build/trans_presets.java:637 +#: build/trans_presets.java:667 build/trans_presets.java:680 +#: build/trans_presets.java:693 build/trans_presets.java:706 +#: build/trans_presets.java:719 build/trans_presets.java:732 +#: build/trans_presets.java:745 build/trans_presets.java:1308 +#: build/trans_presets.java:1498 build/trans_presets.java:1540 msgid "Width (meters)" msgstr "Ширина (метры)" @@ -13397,4 +14387,5 @@ #. item "Streets/Service" combo "Layer" #. item "Streets/Parking Aisle" check "Oneway" +#. item "Streets/Road (Unknown Type)" combo "Layer" #. item "Ways/Construction" combo "Layer" #. item "Ways/Bridleway" combo "Layer" @@ -13413,11 +14404,12 @@ #: build/trans_presets.java:242 build/trans_presets.java:260 #: build/trans_presets.java:279 build/trans_presets.java:294 -#: build/trans_presets.java:409 build/trans_presets.java:429 -#: build/trans_presets.java:449 build/trans_presets.java:468 -#: build/trans_presets.java:487 build/trans_presets.java:506 -#: build/trans_presets.java:524 build/trans_presets.java:545 -#: build/trans_presets.java:566 build/trans_presets.java:587 -#: build/trans_presets.java:608 build/trans_presets.java:629 -#: build/trans_presets.java:660 build/trans_presets.java:1301 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:548 build/trans_presets.java:569 +#: build/trans_presets.java:590 build/trans_presets.java:611 +#: build/trans_presets.java:632 build/trans_presets.java:665 +#: build/trans_presets.java:1306 msgid "Surface" msgstr "Дорожное покрытие" @@ -13427,4 +14419,5 @@ #. item "Streets/Service" combo "Surface" #. item "Streets/Parking Aisle" combo "Surface" +#. item "Streets/Road (Unknown Type)" combo "Surface" #. item "Ways/Construction" combo "Surface" #. item "Ways/Bridleway" combo "Surface" @@ -13439,9 +14432,10 @@ #: build/trans_presets.java:242 build/trans_presets.java:260 #: build/trans_presets.java:279 build/trans_presets.java:294 -#: build/trans_presets.java:409 build/trans_presets.java:429 -#: build/trans_presets.java:449 build/trans_presets.java:468 -#: build/trans_presets.java:487 build/trans_presets.java:506 -#: build/trans_presets.java:524 build/trans_presets.java:545 -#: build/trans_presets.java:660 build/trans_presets.java:1301 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:548 build/trans_presets.java:665 +#: build/trans_presets.java:1306 msgid "paved" msgstr "асфальтированная" @@ -13449,10 +14443,73 @@ #: build/trans_presets.java:242 build/trans_presets.java:260 #: build/trans_presets.java:279 build/trans_presets.java:294 -#: build/trans_presets.java:409 build/trans_presets.java:429 -#: build/trans_presets.java:449 build/trans_presets.java:468 -#: build/trans_presets.java:487 build/trans_presets.java:506 -#: build/trans_presets.java:660 build/trans_presets.java:1301 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 msgid "unpaved" msgstr "неасфальтированная" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +#, fuzzy +msgid "asphalt" +msgstr "Дача/Коттедж" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:548 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +msgid "concrete" +msgstr "бетон" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +#, fuzzy +msgid "metal" +msgstr "Прокат" + +#. color heath +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 build/trans_style.java:3367 +msgid "wood" +msgstr "лес" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +#, fuzzy +msgid "paving_stones" +msgstr "билеты на парковку" #. item "Ways/Track Grade 2" combo "Surface" @@ -13460,12 +14517,94 @@ #: build/trans_presets.java:242 build/trans_presets.java:260 #: build/trans_presets.java:279 build/trans_presets.java:294 -#: build/trans_presets.java:409 build/trans_presets.java:429 -#: build/trans_presets.java:449 build/trans_presets.java:468 -#: build/trans_presets.java:487 build/trans_presets.java:506 -#: build/trans_presets.java:524 build/trans_presets.java:545 -#: build/trans_presets.java:566 build/trans_presets.java:587 -#: build/trans_presets.java:660 build/trans_presets.java:1301 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:548 build/trans_presets.java:569 +#: build/trans_presets.java:590 build/trans_presets.java:665 +#: build/trans_presets.java:1306 msgid "cobblestone" msgstr "мостовая" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:569 build/trans_presets.java:590 +#: build/trans_presets.java:665 build/trans_presets.java:1306 +msgid "gravel" +msgstr "гравий" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +#, fuzzy +msgid "pebblestone" +msgstr "мостовая" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +#, fuzzy +msgid "compacted" +msgstr "неполный" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +#, fuzzy +msgid "grass_paver" +msgstr "трава" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:611 build/trans_presets.java:632 +#: build/trans_presets.java:665 build/trans_presets.java:1306 +msgid "grass" +msgstr "трава" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:569 build/trans_presets.java:590 +#: build/trans_presets.java:611 build/trans_presets.java:632 +#: build/trans_presets.java:665 build/trans_presets.java:1306 +msgid "sand" +msgstr "песок" + +#. item "Ways/Track Grade 4" combo "Surface" +#. item "Ways/Track Grade 5" combo "Surface" +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:569 build/trans_presets.java:590 +#: build/trans_presets.java:611 build/trans_presets.java:632 +#: build/trans_presets.java:665 build/trans_presets.java:1306 +msgid "ground" +msgstr "грунт" #. item "Streets/Residential" text "Width (meters)" @@ -13546,20 +14685,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "Дорожные ограничения" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Править дорожные ограничения" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "Платная" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "Тупик" @@ -13572,8 +14711,8 @@ #. item "Ways/Track Grade 4" combo "Layer" #. item "Ways/Track Grade 5" combo "Layer" -#: build/trans_presets.java:322 build/trans_presets.java:526 -#: build/trans_presets.java:547 build/trans_presets.java:568 -#: build/trans_presets.java:589 build/trans_presets.java:610 -#: build/trans_presets.java:631 +#: build/trans_presets.java:323 build/trans_presets.java:529 +#: build/trans_presets.java:550 build/trans_presets.java:571 +#: build/trans_presets.java:592 build/trans_presets.java:613 +#: build/trans_presets.java:634 msgid "Access" msgstr "Доступ" @@ -13608,32 +14747,47 @@ #. item "Ways/Track Grade 5" combo "Motorcycle" #. item "Ways/Track Grade 5" combo "Motorcar" +#. item "Ways/Path" combo "Foot" +#. item "Ways/Path" combo "Bicycle" +#. item "Ways/Path" combo "Horse" +#. item "Ways/Path" combo "Ski" +#. item "Ways/Path" combo "Snowmobile" #. item "Ways/Path" combo "Motorcar" -#. item "Ways/Path" combo "Snowmobile" -#. item "Ways/Path" combo "Horse" -#. item "Ways/Path" combo "Bicycle" -#. item "Ways/Path" combo "Ski" -#. item "Ways/Path" combo "Foot" +#. item "Car/Parking" combo "Park and Ride" +#. item "Car/Parking" combo "Fee" #. item "Car/Parking" combo "Spaces for Disabled" +#. item "Car/Parking" combo "Spaces for Women" +#. item "Car/Parking" combo "Spaces for Parents" +#. item "Tourism/Information Terminal" combo "Fee" +#. item "Tourism/Audioguide" combo "Fee" #. item "Amenities/Toilets" combo "Fee" +#. item "Amenities/Hunting Stand" combo "Shelter" +#. item "Amenities/Hunting Stand" combo "Hide" +#. item "Amenities/Hunting Stand" combo "Lock" #. item "Health/Pharmacy" combo "Dispensing" -#: 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:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_presets.java:646 -#: build/trans_presets.java:647 build/trans_presets.java:648 -#: build/trans_presets.java:649 build/trans_presets.java:650 -#: build/trans_presets.java:651 build/trans_presets.java:1387 -#: build/trans_presets.java:2328 build/trans_presets.java:2592 +#: 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:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:449 +#: build/trans_presets.java:469 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_presets.java:649 +#: build/trans_presets.java:650 build/trans_presets.java:651 +#: build/trans_presets.java:652 build/trans_presets.java:653 +#: build/trans_presets.java:654 build/trans_presets.java:1393 +#: build/trans_presets.java:1394 build/trans_presets.java:1397 +#: build/trans_presets.java:1398 build/trans_presets.java:1399 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:2397 build/trans_presets.java:2439 +#: build/trans_presets.java:2440 build/trans_presets.java:2441 +#: build/trans_presets.java:2711 msgid "yes" msgstr "да" @@ -13646,40 +14800,40 @@ #. #. -#: 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:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_style.java:212 +#: 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:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_style.java:212 msgid "private" msgstr "частный" -#: 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:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_presets.java:646 -#: build/trans_presets.java:647 build/trans_presets.java:648 -#: build/trans_presets.java:649 build/trans_presets.java:650 -#: build/trans_presets.java:651 +#: 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:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_presets.java:649 +#: build/trans_presets.java:650 build/trans_presets.java:651 +#: build/trans_presets.java:652 build/trans_presets.java:653 +#: build/trans_presets.java:654 msgid "designated" msgstr "предусмотрен" @@ -13692,19 +14846,19 @@ #. #. -#: 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:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_style.java:219 +#: 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:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_style.java:219 msgid "destination" msgstr "назначение" @@ -13727,65 +14881,70 @@ #. #. -#: 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:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_style.java:205 +#: 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:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_style.java:205 msgid "permissive" msgstr "разрешающее" -#: build/trans_presets.java:322 build/trans_presets.java:326 -#: build/trans_presets.java:329 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 +#: build/trans_presets.java:323 build/trans_presets.java:327 +#: build/trans_presets.java:330 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 msgid "agricultural" msgstr "сельскохозяйственное" -#: 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:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_presets.java:646 -#: build/trans_presets.java:647 build/trans_presets.java:648 -#: build/trans_presets.java:649 build/trans_presets.java:650 -#: build/trans_presets.java:651 build/trans_presets.java:768 -#: build/trans_presets.java:783 build/trans_presets.java:1325 -#: build/trans_presets.java:1387 build/trans_presets.java:2328 -#: build/trans_presets.java:2592 +#: 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:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:449 +#: build/trans_presets.java:469 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_presets.java:649 +#: build/trans_presets.java:650 build/trans_presets.java:651 +#: build/trans_presets.java:652 build/trans_presets.java:653 +#: build/trans_presets.java:654 build/trans_presets.java:773 +#: build/trans_presets.java:788 build/trans_presets.java:1330 +#: build/trans_presets.java:1393 build/trans_presets.java:1394 +#: build/trans_presets.java:1397 build/trans_presets.java:1398 +#: build/trans_presets.java:1399 build/trans_presets.java:1763 +#: build/trans_presets.java:1773 build/trans_presets.java:2397 +#: build/trans_presets.java:2439 build/trans_presets.java:2440 +#: build/trans_presets.java:2441 build/trans_presets.java:2711 msgid "no" msgstr "нет" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "Грузовик (до 3.5т)" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "Грузовик (более 3.5т)" @@ -13800,10 +14959,10 @@ #. item "Barriers/Bump Gate" check "Bicycle" #. item "Barriers/Sally Port" check "Bicycle" -#: build/trans_presets.java:327 build/trans_presets.java:648 -#: build/trans_presets.java:853 build/trans_presets.java:886 -#: build/trans_presets.java:908 build/trans_presets.java:945 -#: build/trans_presets.java:958 build/trans_presets.java:970 -#: build/trans_presets.java:982 build/trans_presets.java:994 -#: build/trans_presets.java:1034 +#: build/trans_presets.java:328 build/trans_presets.java:651 +#: build/trans_presets.java:858 build/trans_presets.java:891 +#: build/trans_presets.java:913 build/trans_presets.java:950 +#: build/trans_presets.java:963 build/trans_presets.java:975 +#: build/trans_presets.java:987 build/trans_presets.java:999 +#: build/trans_presets.java:1039 msgid "Horse" msgstr "Лошадь" @@ -13819,17 +14978,16 @@ #. item "Barriers/Bump Gate" check "Horse" #. item "Barriers/Sally Port" check "Horse" -#: build/trans_presets.java:328 build/trans_presets.java:527 -#: build/trans_presets.java:548 build/trans_presets.java:569 -#: build/trans_presets.java:590 build/trans_presets.java:611 -#: build/trans_presets.java:632 build/trans_presets.java:854 -#: build/trans_presets.java:872 build/trans_presets.java:887 -#: build/trans_presets.java:909 build/trans_presets.java:946 -#: build/trans_presets.java:959 build/trans_presets.java:971 -#: build/trans_presets.java:983 build/trans_presets.java:995 -#: build/trans_presets.java:1035 +#: build/trans_presets.java:329 build/trans_presets.java:530 +#: build/trans_presets.java:551 build/trans_presets.java:572 +#: build/trans_presets.java:593 build/trans_presets.java:614 +#: build/trans_presets.java:635 build/trans_presets.java:859 +#: build/trans_presets.java:877 build/trans_presets.java:892 +#: build/trans_presets.java:914 build/trans_presets.java:951 +#: build/trans_presets.java:964 build/trans_presets.java:976 +#: build/trans_presets.java:988 build/trans_presets.java:1000 +#: build/trans_presets.java:1040 msgid "Motorcycle" msgstr "Мотоцикл" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -13841,30 +14999,30 @@ #. item "Barriers/Bump Gate" check "Motorcycle" #. item "Barriers/Sally Port" check "Motorcycle" -#: build/trans_presets.java:329 build/trans_presets.java:528 -#: build/trans_presets.java:549 build/trans_presets.java:570 -#: build/trans_presets.java:591 build/trans_presets.java:612 -#: build/trans_presets.java:633 build/trans_presets.java:646 -#: build/trans_presets.java:873 build/trans_presets.java:888 -#: build/trans_presets.java:910 build/trans_presets.java:947 -#: build/trans_presets.java:960 build/trans_presets.java:972 -#: build/trans_presets.java:984 build/trans_presets.java:996 -#: build/trans_presets.java:1036 +#: build/trans_presets.java:330 build/trans_presets.java:531 +#: build/trans_presets.java:552 build/trans_presets.java:573 +#: build/trans_presets.java:594 build/trans_presets.java:615 +#: build/trans_presets.java:636 build/trans_presets.java:654 +#: build/trans_presets.java:878 build/trans_presets.java:893 +#: build/trans_presets.java:915 build/trans_presets.java:952 +#: build/trans_presets.java:965 build/trans_presets.java:977 +#: build/trans_presets.java:989 build/trans_presets.java:1001 +#: build/trans_presets.java:1041 msgid "Motorcar" msgstr "Автомобиль" -#: build/trans_presets.java:330 +#: build/trans_presets.java:331 msgid "Public Service Vehicles (psv)" msgstr "Транспортные средства общего пользования" -#: build/trans_presets.java:331 +#: build/trans_presets.java:332 msgid "Motorboat" msgstr "Моторная лодка" -#: build/trans_presets.java:332 +#: build/trans_presets.java:333 msgid "Boat" msgstr "Лодка" #. item "Streets/Road Restrictions" text "Max. speed (km/h)" -#: build/trans_presets.java:334 +#: build/trans_presets.java:335 msgid "Min. speed (km/h)" msgstr "Мин. скорость (км/ч)" @@ -13872,25 +15030,25 @@ #. item "Streets/Road Restrictions" text "Min. speed (km/h)" #. item "Streets/Bridge" text "Max. speed (km/h)" -#: build/trans_presets.java:335 build/trans_presets.java:373 +#: build/trans_presets.java:336 build/trans_presets.java:374 msgid "Max. weight (tonnes)" msgstr "Макс. масса (т)" #. item "Streets/Road Restrictions" text "Max. weight (tonnes)" -#: build/trans_presets.java:336 +#: build/trans_presets.java:337 msgid "Max. Height (meters)" msgstr "Макс. Высота (метры)" #. item "Streets/Road Restrictions" text "Max. Height (meters)" -#: build/trans_presets.java:337 +#: build/trans_presets.java:338 msgid "Max. Width (meters)" msgstr "Макс. Ширина (метры)" #. item "Streets/Road Restrictions" text "Max. Width (meters)" -#: build/trans_presets.java:338 +#: build/trans_presets.java:339 msgid "Max. Length (meters)" msgstr "Макс. Длина (метры)" #. item "Streets/Road Restrictions" text "Max. Length (meters)" -#: build/trans_presets.java:340 +#: build/trans_presets.java:341 msgid "Roundabout" msgstr "Круг" @@ -13901,5 +15059,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout" #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" /> -#: build/trans_presets.java:345 +#: build/trans_presets.java:346 msgid "Edit Junction" msgstr "Править перекрёсток" @@ -13915,5 +15073,5 @@ #. #. item "Water/Wetland" text "Name" -#. item "Car/Parking" text "Capacity" +#. item "Car/Parking" text "Reference number" #. item "Man Made/Power Generator" label "Edit Power Generator" #. @@ -13921,9 +15079,9 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: build/trans_presets.java:348 build/trans_presets.java:645 -#: build/trans_presets.java:783 build/trans_presets.java:1130 -#: build/trans_presets.java:1386 build/trans_presets.java:2284 -#: build/trans_presets.java:2770 build/trans_presets.java:2780 -#: build/trans_presets.java:2789 +#: build/trans_presets.java:349 build/trans_presets.java:648 +#: build/trans_presets.java:788 build/trans_presets.java:1135 +#: build/trans_presets.java:1392 build/trans_presets.java:2353 +#: build/trans_presets.java:2898 build/trans_presets.java:2908 +#: build/trans_presets.java:2917 msgid "Type" msgstr "Тип" @@ -13943,10 +15101,10 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:547 +#: build/trans_presets.java:349 build/trans_style.java:547 #: build/trans_style.java:555 msgid "motorway" msgstr "Автобан" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "motorway_link" msgstr "Съезд с автомагистрали" @@ -13968,10 +15126,10 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:563 +#: build/trans_presets.java:349 build/trans_style.java:563 #: build/trans_style.java:571 msgid "trunk" msgstr "Автострада" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "Съезд с автострады" @@ -13993,10 +15151,10 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:579 +#: build/trans_presets.java:349 build/trans_style.java:579 #: build/trans_style.java:587 msgid "primary" msgstr "Основная" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "primary_link" msgstr "Съезд с основной" @@ -14018,5 +15176,5 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:595 +#: build/trans_presets.java:349 build/trans_style.java:595 #: build/trans_style.java:603 msgid "secondary" @@ -14031,9 +15189,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:611 +#: build/trans_presets.java:349 build/trans_style.java:611 msgid "tertiary" msgstr "Третичная" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "unclassified" msgstr "Неклассифицировано" @@ -14047,9 +15205,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:3192 +#: build/trans_presets.java:349 build/trans_style.java:3143 msgid "residential" msgstr "местного значения" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "living_street" msgstr "Жилая" @@ -14079,10 +15237,10 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:667 -#: build/trans_style.java:4285 +#: build/trans_presets.java:349 build/trans_style.java:667 +#: build/trans_style.java:4244 msgid "service" msgstr "Служебная" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "bus_guideway" msgstr "Автобусная дорога" @@ -14112,6 +15270,6 @@ #. #. color construction -#: build/trans_presets.java:348 build/trans_style.java:877 -#: build/trans_style.java:3257 build/trans_style.java:3258 +#: build/trans_presets.java:349 build/trans_style.java:877 +#: build/trans_style.java:3208 build/trans_style.java:3209 msgid "construction" msgstr "Строительство" @@ -14122,10 +15280,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" /> -#: build/trans_presets.java:366 +#: build/trans_presets.java:367 msgid "Edit Bridge" msgstr "Править мост" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "Редактировать Тоннель" @@ -14133,19 +15291,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Дороги" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "Строительство" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Править дорогу, на которой ведётся строительство" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Перекрёсток" @@ -14161,5 +15319,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "Круг" @@ -14168,5 +15326,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "Дорога для всадников" @@ -14174,5 +15332,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "Редактировать дорогу для всадников" @@ -14180,5 +15338,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Велодорожка" @@ -14188,11 +15346,17 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" /> -#: build/trans_presets.java:438 +#: build/trans_presets.java:439 msgid "Edit Cycleway" msgstr "Править велодорожку" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "Пешеходная" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Тротуар" @@ -14201,11 +15365,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Править тротуар" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Шипы" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "Пешеходная" @@ -14214,5 +15384,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Править пешеходную улицу" @@ -14220,5 +15390,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Лестница" @@ -14228,5 +15398,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" /> -#: build/trans_presets.java:495 +#: build/trans_presets.java:498 msgid "Edit Flight of Steps" msgstr "Править лестницу" @@ -14235,5 +15405,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "Грунтовка" @@ -14242,39 +15412,11 @@ #. -#: build/trans_presets.java:515 +#: build/trans_presets.java:518 msgid "Edit Track" msgstr "Править грунтовку" -#: build/trans_presets.java:524 build/trans_presets.java:545 -msgid "concrete" -msgstr "бетон" - -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 -msgid "gravel" -msgstr "гравий" - -#. item "Ways/Track Grade 4" combo "Surface" -#. item "Ways/Track Grade 5" combo "Surface" -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "ground" -msgstr "грунт" - -#: build/trans_presets.java:524 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "grass" -msgstr "трава" - -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "sand" -msgstr "песок" - #. item "Ways/Track" text "Width (meters)" #. -#: build/trans_presets.java:532 +#: build/trans_presets.java:535 msgid "Track Grade 1" msgstr "Грунтовка 1 класса" @@ -14283,5 +15425,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "Править грунтовку 1 класса" @@ -14289,5 +15431,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "Грунтовка 2 класса" @@ -14296,5 +15438,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "Править грунтовку 2 класса" @@ -14302,5 +15444,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "Грунтовка 3 класса" @@ -14309,5 +15451,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "Править грунтовку 3 класса" @@ -14315,5 +15457,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "Грунтовка 4 класса" @@ -14322,5 +15464,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "Править грунтовку 4 класса" @@ -14328,5 +15470,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "Грунтовка 5 класса" @@ -14335,5 +15477,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "Править грунтовку 5 класса" @@ -14342,5 +15484,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Тропа" @@ -14349,19 +15491,22 @@ #. -#: build/trans_presets.java:641 +#: build/trans_presets.java:644 msgid "Edit Path" msgstr "Править тропу" -#: build/trans_presets.java:647 +#: build/trans_presets.java:652 +msgid "Ski" +msgstr "Лыжи" + +#: build/trans_presets.java:653 msgid "Snowmobile" msgstr "Снегоход" -#: build/trans_presets.java:650 -msgid "Ski" -msgstr "Лыжи" - #. item "Ways/Path" text "Width (meters)" #. -#: build/trans_presets.java:665 +#. item "Tourism/Map" label "Routes shown for:" +#. item "Tourism/Guidepost" label "Routes shown for:" +#: build/trans_presets.java:670 build/trans_presets.java:1725 +#: build/trans_presets.java:1748 msgid "Hiking" msgstr "Туризм" @@ -14371,5 +15516,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" /> -#: build/trans_presets.java:669 +#: build/trans_presets.java:674 msgid "Edit Hiking" msgstr "Править туризм" @@ -14377,5 +15522,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "Горный туризм" @@ -14385,5 +15530,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" /> -#: build/trans_presets.java:682 +#: build/trans_presets.java:687 msgid "Edit Mountain Hiking" msgstr "Править горный туризм" @@ -14391,5 +15536,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "Продвинутый горный туризм" @@ -14399,5 +15544,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" /> -#: build/trans_presets.java:695 +#: build/trans_presets.java:700 msgid "Edit Demanding Mountain Hiking" msgstr "Править продвинутый горный туризм" @@ -14405,5 +15550,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "Альпийский туризм" @@ -14413,5 +15558,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" /> -#: build/trans_presets.java:708 +#: build/trans_presets.java:713 msgid "Edit Alpine Hiking" msgstr "Править альпийский туризм" @@ -14419,5 +15564,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "Продвинутый альпийский туризм" @@ -14427,5 +15572,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" /> -#: build/trans_presets.java:721 +#: build/trans_presets.java:726 msgid "Edit Demanding Alpine Hiking" msgstr "Править продвинутый альпийский туризм" @@ -14433,5 +15578,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "Сложный альпийский туризм" @@ -14441,5 +15586,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" /> -#: build/trans_presets.java:734 +#: build/trans_presets.java:739 msgid "Edit Difficult Alpine Hiking" msgstr "Править сложный альпийский туризм" @@ -14447,10 +15592,10 @@ #. item "Ways/Difficult Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:744 +#: build/trans_presets.java:749 msgid "Waypoints" msgstr "Путевые точки" #. group "Waypoints" -#: build/trans_presets.java:745 +#: build/trans_presets.java:750 msgid "Motorway Junction" msgstr "Развязка Автобана" @@ -14458,15 +15603,15 @@ #. item #. -#: build/trans_presets.java:747 +#: build/trans_presets.java:752 msgid "Edit Motorway Junction" msgstr "Править развязку автобана" #. item "Waypoints/Motorway Junction" text "Name" -#: build/trans_presets.java:751 +#: build/trans_presets.java:756 msgid "Number" msgstr "Номер" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:753 +#: build/trans_presets.java:758 msgid "Services" msgstr "Службы" @@ -14474,5 +15619,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "Править службы" @@ -14486,4 +15631,6 @@ #. item "Car/Rental" text "Name" #. item "Car/Sharing" text "Name" +#. item "Tourism/Information Terminal" text "Closer description" +#. item "Tourism/Audioguide" text "Closer description" #. item "Man Made/Power Station" label "Edit Power Station" #. @@ -14503,18 +15650,20 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" #. #. item "Health/Emergency Access Point" text "Point Name" #. item "Relations/Route" text "Network" -#: build/trans_presets.java:760 build/trans_presets.java:897 -#: build/trans_presets.java:1377 build/trans_presets.java:1394 -#: build/trans_presets.java:1401 build/trans_presets.java:1407 -#: build/trans_presets.java:1415 build/trans_presets.java:1422 -#: build/trans_presets.java:2292 build/trans_presets.java:2299 -#: build/trans_presets.java:2315 build/trans_presets.java:2326 -#: build/trans_presets.java:2334 build/trans_presets.java:2341 -#: build/trans_presets.java:2391 build/trans_presets.java:2418 -#: build/trans_presets.java:2573 build/trans_presets.java:2609 -#: build/trans_presets.java:3020 +#: build/trans_presets.java:765 build/trans_presets.java:902 +#: build/trans_presets.java:1382 build/trans_presets.java:1406 +#: build/trans_presets.java:1413 build/trans_presets.java:1419 +#: build/trans_presets.java:1427 build/trans_presets.java:1434 +#: build/trans_presets.java:1761 build/trans_presets.java:1771 +#: build/trans_presets.java:2361 build/trans_presets.java:2368 +#: build/trans_presets.java:2384 build/trans_presets.java:2395 +#: build/trans_presets.java:2403 build/trans_presets.java:2410 +#: build/trans_presets.java:2461 build/trans_presets.java:2509 +#: build/trans_presets.java:2675 build/trans_presets.java:2690 +#: build/trans_presets.java:2729 build/trans_presets.java:3148 msgid "Operator" msgstr "Оператор" @@ -14523,5 +15672,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Светофор" @@ -14531,5 +15680,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "Тип пешеходного перехода" @@ -14538,27 +15687,27 @@ #. item "Waypoints/Pedestrian Crossing" combo "Type" #. item "Railway/Crossing" combo "Crossing type" -#: build/trans_presets.java:768 build/trans_presets.java:783 -#: build/trans_presets.java:1325 +#: build/trans_presets.java:773 build/trans_presets.java:788 +#: build/trans_presets.java:1330 msgid "uncontrolled" msgstr "неуправляемый" -#: build/trans_presets.java:768 build/trans_presets.java:783 -#: build/trans_presets.java:1325 +#: build/trans_presets.java:773 build/trans_presets.java:788 +#: build/trans_presets.java:1330 msgid "traffic_signals" msgstr "Светофор" -#: build/trans_presets.java:768 build/trans_presets.java:783 -#: build/trans_presets.java:1325 +#: build/trans_presets.java:773 build/trans_presets.java:788 +#: build/trans_presets.java:1330 msgid "island" msgstr "остров" -#: build/trans_presets.java:768 build/trans_presets.java:783 -#: build/trans_presets.java:1325 +#: build/trans_presets.java:773 build/trans_presets.java:788 +#: build/trans_presets.java:1330 msgid "unmarked" msgstr "Необозначенный" #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle" -#: build/trans_presets.java:769 build/trans_presets.java:785 -#: build/trans_presets.java:1326 +#: build/trans_presets.java:774 build/trans_presets.java:790 +#: build/trans_presets.java:1331 msgid "Cross on horseback" msgstr "Пересечение с дорогой для всадников" @@ -14566,6 +15715,6 @@ #. item "Waypoints/Traffic Signal" check "Cross on horseback" #. item "Railway/Crossing" check "Cross on horseback" -#: build/trans_presets.java:770 build/trans_presets.java:784 -#: build/trans_presets.java:1327 +#: build/trans_presets.java:775 build/trans_presets.java:789 +#: build/trans_presets.java:1332 msgid "Cross by bicycle" msgstr "Пересечение с велодорожкой" @@ -14574,11 +15723,11 @@ #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback" #. item "Railway/Crossing" check "Cross by bicycle" -#: build/trans_presets.java:771 build/trans_presets.java:786 -#: build/trans_presets.java:1328 +#: build/trans_presets.java:776 build/trans_presets.java:791 +#: build/trans_presets.java:1333 msgid "Crossing attendant" msgstr "Пересекая сопутствующие" #. item "Waypoints/Traffic Signal" check "Crossing attendant" -#: build/trans_presets.java:772 +#: build/trans_presets.java:777 msgid "Crossing type name (UK)" msgstr "Имя типа пересечения (Великобритания)" @@ -14586,30 +15735,30 @@ #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "zebra" msgstr "Зебра" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pelican" msgstr "Пеликан" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "toucan" msgstr "Тукан" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "puffin" msgstr "Тупик (птица)" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pegasus" msgstr "Пегас" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "tiger" msgstr "Тигр" #. -#: build/trans_presets.java:775 +#: build/trans_presets.java:780 msgid "Stop" msgstr "Стоп" @@ -14617,5 +15766,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "Пешеходный переход" @@ -14624,14 +15773,14 @@ #. -#: build/trans_presets.java:781 +#: build/trans_presets.java:786 msgid "Edit Crossing" msgstr "Редактирование пересечения" #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant" -#: build/trans_presets.java:787 +#: build/trans_presets.java:792 msgid "Type name (UK)" msgstr "Имя типа (UK)" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "Мини-круг" @@ -14642,14 +15791,14 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" /> #. -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "Direction" msgstr "Направление" #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "clockwise" msgstr "по часовой стрелке" -#: build/trans_presets.java:796 +#: build/trans_presets.java:801 msgid "Turning Circle" msgstr "Круг для разворота" @@ -14659,20 +15808,20 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" /> #. -#: build/trans_presets.java:801 +#: build/trans_presets.java:806 msgid "City Limit" msgstr "Граница населённого пункта" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "Править границу населённого пункта" #. item "Waypoints/City Limit" text "Name" -#: build/trans_presets.java:807 +#: build/trans_presets.java:812 msgid "Second Name" msgstr "Второе название" #. item "Waypoints/City Limit" text "Second Name" -#: build/trans_presets.java:809 +#: build/trans_presets.java:814 msgid "Speed Camera" msgstr "Автоматический радар" @@ -14680,5 +15829,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Телефон первой необходимости" @@ -14686,5 +15835,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "Подъём" @@ -14692,5 +15841,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "Крутой подъём" @@ -14699,10 +15848,10 @@ #. #. -#: build/trans_presets.java:822 +#: build/trans_presets.java:827 msgid "Ford" msgstr "Брод" #. item -#: build/trans_presets.java:823 +#: build/trans_presets.java:828 msgid "Edit Ford" msgstr "Править брод" @@ -14710,5 +15859,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "Перевал" @@ -14716,5 +15865,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "Править перевал" @@ -14722,11 +15871,11 @@ #. item "Waypoints/Mountain Pass" text "Name" #. item "Accomodation/Alpine Hut" text "Name" -#. item "Tourism/Guidepost (Hiking)" text "Name" +#. item "Tourism/Guidepost" text "Name" #. item "Places/Peak" text "Name" #. item "Places/Glacier" text "Name" #. item "Places/Volcano" text "Name" -#: build/trans_presets.java:837 build/trans_presets.java:1588 -#: build/trans_presets.java:1713 build/trans_presets.java:2714 -#: build/trans_presets.java:2721 build/trans_presets.java:2728 +#: build/trans_presets.java:842 build/trans_presets.java:1600 +#: build/trans_presets.java:1745 build/trans_presets.java:2842 +#: build/trans_presets.java:2849 build/trans_presets.java:2856 msgid "Elevation" msgstr "Возвышение" @@ -14734,5 +15883,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Преграды" @@ -14740,5 +15889,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "Столбик" @@ -14746,5 +15895,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "Править столбик" @@ -14789,16 +15938,16 @@ #. #. -#: build/trans_presets.java:849 build/trans_presets.java:868 -#: build/trans_presets.java:882 build/trans_presets.java:904 -#: build/trans_presets.java:941 build/trans_presets.java:954 -#: build/trans_presets.java:966 build/trans_presets.java:978 -#: build/trans_presets.java:990 build/trans_presets.java:1002 -#: build/trans_presets.java:1012 build/trans_presets.java:1021 -#: build/trans_presets.java:1030 +#: build/trans_presets.java:854 build/trans_presets.java:873 +#: build/trans_presets.java:887 build/trans_presets.java:909 +#: build/trans_presets.java:946 build/trans_presets.java:959 +#: build/trans_presets.java:971 build/trans_presets.java:983 +#: build/trans_presets.java:995 build/trans_presets.java:1007 +#: build/trans_presets.java:1017 build/trans_presets.java:1026 +#: build/trans_presets.java:1035 msgid "Allowed traffic:" msgstr "Разрешено движение:" #. item "Barriers/Bollard" check "Motorcycle" -#: build/trans_presets.java:856 +#: build/trans_presets.java:861 msgid "Cycle Barrier" msgstr "Преграда для велосипедов" @@ -14807,5 +15956,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "Бетонный блок" @@ -14813,5 +15962,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "Забор препятствующий выходу скота с пастбища на дорогу" @@ -14819,10 +15968,10 @@ #. item #. -#: build/trans_presets.java:865 +#: build/trans_presets.java:870 msgid "Edit Cattle Grid" msgstr "Редактировать Забор препятствующий выходу скота с пастбища на дорогу" #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:875 +#: build/trans_presets.java:880 msgid "Bus Trap" msgstr "Автобусное место" @@ -14830,15 +15979,15 @@ #. item #. -#: build/trans_presets.java:878 +#: build/trans_presets.java:883 msgid "Spikes" msgstr "Шипы" #. item -#: build/trans_presets.java:879 +#: build/trans_presets.java:884 msgid "Edit Spikes" msgstr "Редактировать выступ" #. item "Barriers/Spikes" check "Motorcar" -#: build/trans_presets.java:890 +#: build/trans_presets.java:895 msgid "Toll Booth" msgstr "Оплата проезда" @@ -14846,5 +15995,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Править пункт оплаты проезда" @@ -14852,10 +16001,10 @@ #. item "Barriers/Toll Booth" text "Operator" #. -#: build/trans_presets.java:900 +#: build/trans_presets.java:905 msgid "Border Control" msgstr "Пограничный контороль" #. item -#: build/trans_presets.java:901 +#: build/trans_presets.java:906 msgid "Edit Border Control" msgstr "Править пограничный контороль" @@ -14865,5 +16014,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Живая изгородь" @@ -14872,5 +16021,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "Забор" @@ -14879,5 +16028,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "Стена" @@ -14885,5 +16034,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "Городская стена" @@ -14892,5 +16041,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "Подпорная стена" @@ -14902,15 +16051,15 @@ #. #. -#: build/trans_presets.java:937 +#: build/trans_presets.java:942 msgid "Entrance" msgstr "Вход" #. item -#: build/trans_presets.java:938 +#: build/trans_presets.java:943 msgid "Edit Entrance" msgstr "Править вход" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:949 +#: build/trans_presets.java:954 msgid "Gate" msgstr "Ворота" @@ -14918,50 +16067,50 @@ #. item #. -#: build/trans_presets.java:951 +#: build/trans_presets.java:956 msgid "Edit Gate" msgstr "Править ворота" #. item "Barriers/Gate" check "Motorcar" -#: build/trans_presets.java:962 +#: build/trans_presets.java:967 msgid "Lift Gate" msgstr "Шлагбаум" #. item -#: build/trans_presets.java:963 +#: build/trans_presets.java:968 msgid "Edit Lift Gate" msgstr "Править шлагбаум" #. item "Barriers/Lift Gate" check "Motorcar" -#: build/trans_presets.java:974 +#: build/trans_presets.java:979 msgid "Hampshire Gate" msgstr "Ворота Гэмпшир" #. item -#: build/trans_presets.java:975 +#: build/trans_presets.java:980 msgid "Edit Hampshire Gate" msgstr "Редактировать Ворота Гэмпшир" #. item "Barriers/Hampshire Gate" check "Motorcar" -#: build/trans_presets.java:986 +#: build/trans_presets.java:991 msgid "Bump Gate" msgstr "Портовые ворота" #. item -#: build/trans_presets.java:987 +#: build/trans_presets.java:992 msgid "Edit Bump Gate" msgstr "Редактировать Портовые ворота" #. item "Barriers/Bump Gate" check "Motorcar" -#: build/trans_presets.java:998 +#: build/trans_presets.java:1003 msgid "Kissing Gate" msgstr "Узкая калитка" #. item -#: build/trans_presets.java:999 +#: build/trans_presets.java:1004 msgid "Edit Kissing Gate" msgstr "Редактировать Узкая калитка" #. item "Barriers/Kissing Gate" check "Bicycle" -#: build/trans_presets.java:1007 +#: build/trans_presets.java:1012 msgid "Stile" msgstr "ступеньки для перехода через ограждение" @@ -14969,25 +16118,25 @@ #. item #. -#: build/trans_presets.java:1009 +#: build/trans_presets.java:1014 msgid "Edit Stile" msgstr "Редактировать ступеньки для перехода через ограждение" #. item "Barriers/Stile" check "Bicycle" -#: build/trans_presets.java:1017 +#: build/trans_presets.java:1022 msgid "Turnstile" msgstr "" #. item -#: build/trans_presets.java:1018 +#: build/trans_presets.java:1023 msgid "Edit Turnstile" msgstr "" #. item "Barriers/Turnstile" check "Bicycle" -#: build/trans_presets.java:1026 +#: build/trans_presets.java:1031 msgid "Sally Port" msgstr "Двойные ворота" #. item -#: build/trans_presets.java:1027 +#: build/trans_presets.java:1032 msgid "Edit Sally Port" msgstr "Править двойные ворота" @@ -14998,10 +16147,10 @@ #. item "Water/River" combo "Layer" #. -#: build/trans_presets.java:1041 build/trans_presets.java:1084 +#: build/trans_presets.java:1046 build/trans_presets.java:1089 msgid "Water" msgstr "Вода" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "Источник" @@ -15009,5 +16158,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Править источник" @@ -15015,5 +16164,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "Водосток" @@ -15021,10 +16170,10 @@ #. item #. -#: build/trans_presets.java:1051 +#: build/trans_presets.java:1056 msgid "Edit Drain" msgstr "Править водосток" #. item "Water/Drain" combo "Layer" -#: build/trans_presets.java:1057 +#: build/trans_presets.java:1062 msgid "Stream" msgstr "Ручей" @@ -15032,10 +16181,10 @@ #. item #. -#: build/trans_presets.java:1059 +#: build/trans_presets.java:1064 msgid "Edit Stream" msgstr "Править ручей" #. item "Water/Stream" combo "Layer" -#: build/trans_presets.java:1065 +#: build/trans_presets.java:1070 msgid "Canal" msgstr "Канал" @@ -15043,10 +16192,10 @@ #. item #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:1072 msgid "Edit Canal" msgstr "Править канал" #. item "Water/Canal" combo "Layer" -#: build/trans_presets.java:1073 +#: build/trans_presets.java:1078 msgid "River" msgstr "Река" @@ -15056,5 +16205,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" /> -#: build/trans_presets.java:1077 +#: build/trans_presets.java:1082 msgid "Edit River" msgstr "Править реку" @@ -15062,15 +16211,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Править воду" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "Суша" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Править сушу" @@ -15078,15 +16227,15 @@ #. item "Water/Land" text "Name" #. -#: build/trans_presets.java:1096 +#: build/trans_presets.java:1101 msgid "Basin" msgstr "Бассейн" #. item -#: build/trans_presets.java:1097 +#: build/trans_presets.java:1102 msgid "Edit Basin Landuse" msgstr "Править резервуар" #. item "Water/Basin" text "Name" -#: build/trans_presets.java:1102 +#: build/trans_presets.java:1107 msgid "Reservoir" msgstr "Резервуар" @@ -15094,15 +16243,15 @@ #. item #. -#: build/trans_presets.java:1104 +#: build/trans_presets.java:1109 msgid "Edit Reservoir Landuse" msgstr "Править резервуар" #. item "Water/Reservoir" text "Name" -#: build/trans_presets.java:1109 +#: build/trans_presets.java:1114 msgid "Covered Reservoir" msgstr "Крытый резервуар" #. item -#: build/trans_presets.java:1110 +#: build/trans_presets.java:1115 msgid "Edit Covered Reservoir" msgstr "Править крытый резервуар" @@ -15110,5 +16259,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Берег реки" @@ -15117,10 +16266,10 @@ #. -#: build/trans_presets.java:1118 +#: build/trans_presets.java:1123 msgid "Edit Riverbank" msgstr "Править берег реки" #. item "Water/Riverbank" text "Name" -#: build/trans_presets.java:1122 +#: build/trans_presets.java:1127 msgid "Wetland" msgstr "Заболоченная территория" @@ -15131,14 +16280,14 @@ #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland" #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" /> -#: build/trans_presets.java:1127 +#: build/trans_presets.java:1132 msgid "Edit Wetland" msgstr "Редактировать заболоченная территория" #. item "Water/Wetland" combo "Type" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "swamp" msgstr "болото" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "bog" msgstr "трясина" @@ -15152,35 +16301,35 @@ #. #. -#: build/trans_presets.java:1130 build/trans_style.java:3433 +#: build/trans_presets.java:1135 build/trans_style.java:3384 msgid "marsh" msgstr "Болото" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "reedbed" msgstr "плавни" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "saltmarsh" msgstr "солевое болото" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "tidalflat" msgstr "ватты" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "mangrove" msgstr "мангры" -#: build/trans_presets.java:1132 +#: build/trans_presets.java:1137 msgid "Mud" msgstr "Грязь" #. item -#: build/trans_presets.java:1133 +#: build/trans_presets.java:1138 msgid "Edit Mud" msgstr "Править грязь" #. item "Water/Mud" text "Name" -#: build/trans_presets.java:1137 +#: build/trans_presets.java:1142 msgid "Beach" msgstr "Пляж" @@ -15188,20 +16337,20 @@ #. item #. -#: build/trans_presets.java:1139 +#: build/trans_presets.java:1144 msgid "Edit Beach" msgstr "Править пляж" #. item "Water/Beach" text "Name" -#: build/trans_presets.java:1143 +#: build/trans_presets.java:1148 msgid "Bay" msgstr "Бухта" #. item -#: build/trans_presets.java:1144 +#: build/trans_presets.java:1149 msgid "Edit Bay" msgstr "Править бухту" #. item "Water/Bay" text "Name" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1153 msgid "Cliff" msgstr "Скала" @@ -15209,10 +16358,10 @@ #. item #. -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1155 msgid "Edit Cliff" msgstr "Править скалу" #. item "Water/Cliff" text "Name" -#: build/trans_presets.java:1154 +#: build/trans_presets.java:1159 msgid "Coastline" msgstr "Побережье" @@ -15220,5 +16369,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Править побережье" @@ -15226,5 +16375,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "Паромная переправа" @@ -15232,5 +16381,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "Править переправу" @@ -15239,5 +16388,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "Лодочная мастерская" @@ -15245,10 +16394,10 @@ #. item #. -#: build/trans_presets.java:1173 +#: build/trans_presets.java:1178 msgid "Edit Boatyard" msgstr "Править лодочную мастерскую" #. item "Water/Boatyard" text "Name" -#: build/trans_presets.java:1178 +#: build/trans_presets.java:1183 msgid "Dock" msgstr "Причал" @@ -15256,5 +16405,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "Править причал" @@ -15262,5 +16411,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Дамба" @@ -15268,15 +16417,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Править дамбу" #. item "Water/Dam" text "Name" -#: build/trans_presets.java:1194 +#: build/trans_presets.java:1199 msgid "Waterway Point" msgstr "Гидротехнические сооружения" #. group "Waterway Point" -#: build/trans_presets.java:1195 +#: build/trans_presets.java:1200 msgid "Lock Gate" msgstr "Ворота шлюза" @@ -15285,5 +16434,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "Водослив" @@ -15291,20 +16440,20 @@ #. item #. -#: build/trans_presets.java:1201 +#: build/trans_presets.java:1206 msgid "Edit Weir" msgstr "Править водослив" #. item "Waterway Point/Weir" text "Name" -#: build/trans_presets.java:1206 +#: build/trans_presets.java:1211 msgid "Waterfall" msgstr "Водопад" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "Править водопад" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "Разворот" @@ -15313,15 +16462,15 @@ #. #. -#: build/trans_presets.java:1216 +#: build/trans_presets.java:1221 msgid "Marina" msgstr "Пристань для яхт" #. item -#: build/trans_presets.java:1217 +#: build/trans_presets.java:1222 msgid "Edit Marina" msgstr "Править пристань для яхт" #. item "Waterway Point/Marina" text "Name" -#: build/trans_presets.java:1221 +#: build/trans_presets.java:1226 msgid "Pier" msgstr "Пирс" @@ -15329,10 +16478,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Править пирс" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "Паромная станция" @@ -15340,10 +16489,10 @@ #. item #. -#: build/trans_presets.java:1229 +#: build/trans_presets.java:1234 msgid "Edit Ferry Terminal" msgstr "Править паромную станцию" #. item "Waterway Point/Ferry Terminal" text "Name" -#: build/trans_presets.java:1233 +#: build/trans_presets.java:1238 msgid "Slipway" msgstr "Слип" @@ -15353,5 +16502,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" /> -#: build/trans_presets.java:1237 +#: build/trans_presets.java:1242 msgid "Edit Slipway" msgstr "Править слип" @@ -15359,10 +16508,10 @@ #. item "Waterway Point/Slipway" text "Name" #. -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1248 msgid "Railway" msgstr "Железная дорога" #. group "Railway" -#: build/trans_presets.java:1244 +#: build/trans_presets.java:1249 msgid "Rail" msgstr "Железная дорога" @@ -15370,5 +16519,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Править железную дорогу" @@ -15398,8 +16547,8 @@ #. #. -#: build/trans_presets.java:1249 build/trans_presets.java:1255 -#: build/trans_presets.java:1262 build/trans_presets.java:1268 -#: build/trans_presets.java:1274 build/trans_presets.java:1280 -#: build/trans_presets.java:1286 build/trans_presets.java:1311 +#: build/trans_presets.java:1254 build/trans_presets.java:1260 +#: build/trans_presets.java:1267 build/trans_presets.java:1273 +#: build/trans_presets.java:1279 build/trans_presets.java:1285 +#: build/trans_presets.java:1291 build/trans_presets.java:1316 msgid "Optional Types" msgstr "Необязательные типы" @@ -15413,35 +16562,35 @@ #. item "Railway/Tram" combo "Optional Types" #. item "Railway/Disused Rail" combo "Optional Types" -#: build/trans_presets.java:1249 build/trans_presets.java:1255 -#: build/trans_presets.java:1262 build/trans_presets.java:1268 -#: build/trans_presets.java:1274 build/trans_presets.java:1280 -#: build/trans_presets.java:1286 build/trans_presets.java:1311 +#: build/trans_presets.java:1254 build/trans_presets.java:1260 +#: build/trans_presets.java:1267 build/trans_presets.java:1273 +#: build/trans_presets.java:1279 build/trans_presets.java:1285 +#: build/trans_presets.java:1291 build/trans_presets.java:1316 msgid "yard" msgstr "сад" -#: build/trans_presets.java:1249 build/trans_presets.java:1255 -#: build/trans_presets.java:1262 build/trans_presets.java:1268 -#: build/trans_presets.java:1274 build/trans_presets.java:1280 -#: build/trans_presets.java:1286 build/trans_presets.java:1311 +#: build/trans_presets.java:1254 build/trans_presets.java:1260 +#: build/trans_presets.java:1267 build/trans_presets.java:1273 +#: build/trans_presets.java:1279 build/trans_presets.java:1285 +#: build/trans_presets.java:1291 build/trans_presets.java:1316 msgid "siding" msgstr "запасный путь" -#: build/trans_presets.java:1249 build/trans_presets.java:1255 -#: build/trans_presets.java:1262 build/trans_presets.java:1268 -#: build/trans_presets.java:1274 build/trans_presets.java:1280 -#: build/trans_presets.java:1286 build/trans_presets.java:1311 +#: build/trans_presets.java:1254 build/trans_presets.java:1260 +#: build/trans_presets.java:1267 build/trans_presets.java:1273 +#: build/trans_presets.java:1279 build/trans_presets.java:1285 +#: build/trans_presets.java:1291 build/trans_presets.java:1316 msgid "spur" msgstr "ответвление" -#: build/trans_presets.java:1251 +#: build/trans_presets.java:1256 msgid "Narrow Gauge Rail" msgstr "Узкоколейка" #. item -#: build/trans_presets.java:1252 +#: build/trans_presets.java:1257 msgid "Edit Narrow Gauge Rail" msgstr "Править узкоколейку" -#: build/trans_presets.java:1257 +#: build/trans_presets.java:1262 msgid "Monorail" msgstr "Монорельс" @@ -15449,45 +16598,45 @@ #. item #. -#: build/trans_presets.java:1259 +#: build/trans_presets.java:1264 msgid "Edit Monorail" msgstr "Править монорельс" -#: build/trans_presets.java:1264 +#: build/trans_presets.java:1269 msgid "Preserved" msgstr "Историческая" #. item -#: build/trans_presets.java:1265 +#: build/trans_presets.java:1270 msgid "Edit Preserved Railway" msgstr "Править историческую дорогу" -#: build/trans_presets.java:1270 +#: build/trans_presets.java:1275 msgid "Light Rail" msgstr "Лёгкая железная дорога" #. item -#: build/trans_presets.java:1271 +#: build/trans_presets.java:1276 msgid "Edit Light Rail" msgstr "Править лёгкую железную дорогу" -#: build/trans_presets.java:1276 +#: build/trans_presets.java:1281 msgid "Subway" msgstr "Метрополитен" #. item -#: build/trans_presets.java:1277 +#: build/trans_presets.java:1282 msgid "Edit Subway" msgstr "Править метрополитен" -#: build/trans_presets.java:1282 +#: build/trans_presets.java:1287 msgid "Tram" msgstr "Трамвай" #. item -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1288 msgid "Edit Tram" msgstr "Править трамвай" -#: build/trans_presets.java:1288 +#: build/trans_presets.java:1293 msgid "Bus Guideway" msgstr "Направляемый автобус" @@ -15495,5 +16644,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "Править рельсовый автобус" @@ -15502,14 +16651,14 @@ #. #. -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1312 msgid "Disused Rail" msgstr "Неиспользуемая" #. item -#: build/trans_presets.java:1308 +#: build/trans_presets.java:1313 msgid "Edit Disused Railway" msgstr "Править неиспользуемую дорогу" -#: build/trans_presets.java:1313 +#: build/trans_presets.java:1318 msgid "Abandoned Rail" msgstr "Заброшенная" @@ -15518,5 +16667,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "Переезд" @@ -15525,5 +16674,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "Пересечение" @@ -15533,5 +16682,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "Тип пересечения" @@ -15539,5 +16688,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "Поворотный стол" @@ -15546,10 +16695,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "Надземные пути" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "Кресельная дорога" @@ -15557,10 +16706,10 @@ #. item #. -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1344 msgid "Edit Chair Lift" msgstr "Править кресельную дорогу" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1343 +#: build/trans_presets.java:1348 msgid "Drag Lift" msgstr "Бугельный подъёмник" @@ -15568,10 +16717,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Править бугельный подъёмник" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "Канатная дорога" @@ -15579,10 +16728,10 @@ #. item #. -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1356 msgid "Edit Cable Car" msgstr "Править канатную дорогу" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1360 msgid "Gondola" msgstr "Гондола" @@ -15590,5 +16739,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "Редактировать Гондолу" @@ -15596,5 +16745,5 @@ #. item "Aerialway/Gondola" text "Name" #. group "Public Transport" -#: build/trans_presets.java:1361 build/trans_presets.java:1449 +#: build/trans_presets.java:1366 build/trans_presets.java:1461 msgid "Station" msgstr "Станция" @@ -15605,10 +16754,10 @@ #. -#: build/trans_presets.java:1363 build/trans_presets.java:1452 +#: build/trans_presets.java:1368 build/trans_presets.java:1464 msgid "Edit Station" msgstr "Править станцию" #. group "Car" -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1375 msgid "Fuel" msgstr "Заправка" @@ -15618,9 +16767,238 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" /> -#: build/trans_presets.java:1374 +#: build/trans_presets.java:1379 msgid "Edit Fuel" msgstr "Править заправку" #. item "Car/Fuel" text "Operator" +#. item "Food+Drinks/Cafe" text "Name" +#. item "Food+Drinks/Pub" text "Name" +#. item "Food+Drinks/Biergarten" text "Name" +#. item "Food+Drinks/Bar" text "Name" +#. item "Food+Drinks/Nightclub" text "Name" +#. item "Tourism/Attraction" text "Name" +#. item "Tourism/Museum" text "Name" +#. item "Tourism/Zoo" text "Name" +#. item "Tourism/Theme Park" text "Name" +#. item "Tourism/Information Office" text "Name" +#. item "Historic Places/Ruins" text "Name" +#. item "Historic Places/Archaeological Site" text "Name" +#. item "Sport Facilities/Golf Course" text "Name" +#. item "Sport Facilities/Miniature Golf" text "Name" +#. item "Buildings/Library" text "Name" +#. item +#. +#. +#. item "Amenities/Baby Hatch" text "Operator" +#. item "Shops/Supermarket" text "Name" +#. item "Shops/Chemist" text "Name" +#. item "Shops/Convenience Store" text "Name" +#. item "Shops/Kiosk" text "Name" +#. item "Shops/Book Store" text "Name" +#. item "Shops/Travel Agency" text "Name" +#. item "Shops/Butcher" text "Name" +#. item "Shops/Baker" text "Name" +#. item "Shops/Florist" text "Name" +#. item "Shops/Organic" text "Name" +#. item "Shops/Alcohol" text "Name" +#. item "Shops/Beverages" text "Name" +#. item "Shops/Computer" text "Name" +#. item "Shops/Electronics" text "Name" +#. item "Shops/Hifi" text "Name" +#. item "Shops/Furniture" text "Name" +#. item "Shops/Garden Centre" text "Name" +#. item "Shops/Hardware" text "Name" +#. item "Shops/Do-it-yourself-store" text "Name" +#. item "Shops/Stationery" text "Name" +#. item "Shops/Hairdresser" text "Name" +#. item "Shops/Shoes" text "Name" +#. item "Shops/Toys" text "Name" +#. item "Shops/Video" text "Name" +#. item "Shops/Dry Cleaning" text "Name" +#. item "Shops/Laundry" text "Name" +#. item "Shops/Outdoor" text "Name" +#. item "Shops/Sports" text "Name" +#. item "Shops/Optician" text "Name" +#. item "Cash/Bank" text "Operator" +#. item "Cash/Money Exchange" text "Name" +#. item "Health/Doctors" text "Name" +#. item "Health/Dentist" text "Name" +#. item "Health/Pharmacy" text "Name" +#. item "Health/Veterinary" text "Name" +#: build/trans_presets.java:1383 build/trans_presets.java:1621 +#: build/trans_presets.java:1629 build/trans_presets.java:1636 +#: build/trans_presets.java:1643 build/trans_presets.java:1649 +#: build/trans_presets.java:1656 build/trans_presets.java:1663 +#: build/trans_presets.java:1671 build/trans_presets.java:1678 +#: build/trans_presets.java:1686 build/trans_presets.java:1699 +#: build/trans_presets.java:1713 build/trans_presets.java:1810 +#: build/trans_presets.java:1818 build/trans_presets.java:1909 +#: build/trans_presets.java:1915 build/trans_presets.java:2226 +#: build/trans_presets.java:2250 build/trans_presets.java:2433 +#: build/trans_presets.java:2462 build/trans_presets.java:2470 +#: build/trans_presets.java:2476 build/trans_presets.java:2483 +#: build/trans_presets.java:2490 build/trans_presets.java:2496 +#: build/trans_presets.java:2502 build/trans_presets.java:2524 +#: build/trans_presets.java:2531 build/trans_presets.java:2538 +#: build/trans_presets.java:2544 build/trans_presets.java:2551 +#: build/trans_presets.java:2557 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2581 build/trans_presets.java:2588 +#: build/trans_presets.java:2595 build/trans_presets.java:2602 +#: build/trans_presets.java:2608 build/trans_presets.java:2614 +#: build/trans_presets.java:2620 build/trans_presets.java:2626 +#: build/trans_presets.java:2632 build/trans_presets.java:2639 +#: build/trans_presets.java:2646 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2676 build/trans_presets.java:2684 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2713 build/trans_presets.java:2740 +msgid "Opening Hours" +msgstr "Часы работы" + +#. item "Car/Fuel" combo "Opening Hours" +#. item "Food+Drinks/Restaurant" combo "Opening Hours" +#. item "Food+Drinks/Fast Food" combo "Opening Hours" +#. item "Food+Drinks/Cafe" combo "Opening Hours" +#. item "Food+Drinks/Pub" combo "Opening Hours" +#. item "Food+Drinks/Biergarten" combo "Opening Hours" +#. item "Food+Drinks/Bar" combo "Opening Hours" +#. item "Food+Drinks/Nightclub" combo "Opening Hours" +#. item "Tourism/Museum" combo "Opening Hours" +#. item "Tourism/Zoo" combo "Opening Hours" +#. item "Tourism/Theme Park" combo "Opening Hours" +#. item "Tourism/Information Office" combo "Opening Hours" +#. item "Historic Places/Ruins" combo "Opening Hours" +#. item "Historic Places/Archaeological Site" combo "Opening Hours" +#. item "Sport Facilities/Golf Course" combo "Opening Hours" +#. item "Sport Facilities/Miniature Golf" combo "Opening Hours" +#. item "Buildings/Library" combo "Opening Hours" +#. item "Buildings/Place of Worship" combo "Opening Hours" +#. item "Amenities/Bench" combo "Opening Hours" +#. item "Shops/Supermarket" combo "Opening Hours" +#. item "Shops/Chemist" combo "Opening Hours" +#. item "Shops/Convenience Store" combo "Opening Hours" +#. item "Shops/Kiosk" combo "Opening Hours" +#. item "Shops/Book Store" combo "Opening Hours" +#. item "Shops/Travel Agency" combo "Opening Hours" +#. item "Shops/Butcher" combo "Opening Hours" +#. item "Shops/Baker" combo "Opening Hours" +#. item "Shops/Florist" combo "Opening Hours" +#. item "Shops/Organic" combo "Opening Hours" +#. item "Shops/Alcohol" combo "Opening Hours" +#. item "Shops/Beverages" combo "Opening Hours" +#. item "Shops/Computer" combo "Opening Hours" +#. item "Shops/Electronics" combo "Opening Hours" +#. item "Shops/Hifi" combo "Opening Hours" +#. item "Shops/Furniture" combo "Opening Hours" +#. item "Shops/Garden Centre" combo "Opening Hours" +#. item "Shops/Hardware" combo "Opening Hours" +#. item "Shops/Do-it-yourself-store" combo "Opening Hours" +#. item "Shops/Stationery" combo "Opening Hours" +#. item "Shops/Hairdresser" combo "Opening Hours" +#. item "Shops/Shoes" combo "Opening Hours" +#. item "Shops/Toys" combo "Opening Hours" +#. item "Shops/Video" combo "Opening Hours" +#. item "Shops/Dry Cleaning" combo "Opening Hours" +#. item "Shops/Laundry" combo "Opening Hours" +#. item "Shops/Outdoor" combo "Opening Hours" +#. item "Shops/Sports" combo "Opening Hours" +#. item "Shops/Optician" combo "Opening Hours" +#. item "Cash/Bank" combo "Opening Hours" +#. item "Cash/Money Exchange" combo "Opening Hours" +#. item "Health/Doctors" combo "Opening Hours" +#. item "Health/Dentist" combo "Opening Hours" +#. item "Health/Pharmacy" combo "Opening Hours" +#. item "Health/Veterinary" combo "Opening Hours" +#: build/trans_presets.java:1383 build/trans_presets.java:1621 +#: build/trans_presets.java:1629 build/trans_presets.java:1636 +#: build/trans_presets.java:1643 build/trans_presets.java:1649 +#: build/trans_presets.java:1656 build/trans_presets.java:1663 +#: build/trans_presets.java:1678 build/trans_presets.java:1686 +#: build/trans_presets.java:1699 build/trans_presets.java:1713 +#: build/trans_presets.java:1810 build/trans_presets.java:1818 +#: build/trans_presets.java:1909 build/trans_presets.java:1915 +#: build/trans_presets.java:2226 build/trans_presets.java:2250 +#: build/trans_presets.java:2433 build/trans_presets.java:2470 +#: build/trans_presets.java:2476 build/trans_presets.java:2483 +#: build/trans_presets.java:2490 build/trans_presets.java:2496 +#: build/trans_presets.java:2502 build/trans_presets.java:2524 +#: build/trans_presets.java:2531 build/trans_presets.java:2538 +#: build/trans_presets.java:2544 build/trans_presets.java:2551 +#: build/trans_presets.java:2557 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2581 build/trans_presets.java:2588 +#: build/trans_presets.java:2595 build/trans_presets.java:2602 +#: build/trans_presets.java:2608 build/trans_presets.java:2614 +#: build/trans_presets.java:2620 build/trans_presets.java:2626 +#: build/trans_presets.java:2632 build/trans_presets.java:2639 +#: build/trans_presets.java:2646 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2676 build/trans_presets.java:2684 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2713 build/trans_presets.java:2740 +msgid "24/7" +msgstr "" + +#: build/trans_presets.java:1383 build/trans_presets.java:1621 +#: build/trans_presets.java:1629 build/trans_presets.java:1636 +#: build/trans_presets.java:1643 build/trans_presets.java:1649 +#: build/trans_presets.java:1656 build/trans_presets.java:1663 +#: build/trans_presets.java:1678 build/trans_presets.java:1686 +#: build/trans_presets.java:1699 build/trans_presets.java:1713 +#: build/trans_presets.java:1810 build/trans_presets.java:1818 +#: build/trans_presets.java:1909 build/trans_presets.java:1915 +#: build/trans_presets.java:2226 build/trans_presets.java:2250 +#: build/trans_presets.java:2433 build/trans_presets.java:2470 +#: build/trans_presets.java:2476 build/trans_presets.java:2483 +#: build/trans_presets.java:2490 build/trans_presets.java:2496 +#: build/trans_presets.java:2502 build/trans_presets.java:2524 +#: build/trans_presets.java:2531 build/trans_presets.java:2538 +#: build/trans_presets.java:2544 build/trans_presets.java:2551 +#: build/trans_presets.java:2557 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2581 build/trans_presets.java:2588 +#: build/trans_presets.java:2595 build/trans_presets.java:2602 +#: build/trans_presets.java:2608 build/trans_presets.java:2614 +#: build/trans_presets.java:2620 build/trans_presets.java:2626 +#: build/trans_presets.java:2632 build/trans_presets.java:2639 +#: build/trans_presets.java:2646 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2676 build/trans_presets.java:2684 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2713 build/trans_presets.java:2740 +msgid "Mo-Fr 08:30-20:00" +msgstr "" + +#: build/trans_presets.java:1383 build/trans_presets.java:1621 +#: build/trans_presets.java:1629 build/trans_presets.java:1636 +#: build/trans_presets.java:1643 build/trans_presets.java:1649 +#: build/trans_presets.java:1656 build/trans_presets.java:1663 +#: build/trans_presets.java:1678 build/trans_presets.java:1686 +#: build/trans_presets.java:1699 build/trans_presets.java:1713 +#: build/trans_presets.java:1810 build/trans_presets.java:1818 +#: build/trans_presets.java:1909 build/trans_presets.java:1915 +#: build/trans_presets.java:2226 build/trans_presets.java:2250 +#: build/trans_presets.java:2433 build/trans_presets.java:2470 +#: build/trans_presets.java:2476 build/trans_presets.java:2483 +#: build/trans_presets.java:2490 build/trans_presets.java:2496 +#: build/trans_presets.java:2502 build/trans_presets.java:2524 +#: build/trans_presets.java:2531 build/trans_presets.java:2538 +#: build/trans_presets.java:2544 build/trans_presets.java:2551 +#: build/trans_presets.java:2557 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2581 build/trans_presets.java:2588 +#: build/trans_presets.java:2595 build/trans_presets.java:2602 +#: build/trans_presets.java:2608 build/trans_presets.java:2614 +#: build/trans_presets.java:2620 build/trans_presets.java:2626 +#: build/trans_presets.java:2632 build/trans_presets.java:2639 +#: build/trans_presets.java:2646 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2676 build/trans_presets.java:2684 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2713 build/trans_presets.java:2740 +msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" +msgstr "" + #. group "Bicycle" #. -#: build/trans_presets.java:1379 build/trans_presets.java:1426 +#: build/trans_presets.java:1385 build/trans_presets.java:1438 #: build/trans_surveyor.java:24 msgid "Parking" @@ -15640,106 +17018,141 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Править стоянку" #. item "Car/Parking" text "Name" +#. item "Tourism/Information Terminal" text "Operator" +#. item "Tourism/Audioguide" text "Operator" +#. item "Amenities/Toilets" text "Operator" +#. item "Shops/Vending machine" text "Operator" +#: build/trans_presets.java:1391 build/trans_presets.java:1762 +#: build/trans_presets.java:1772 build/trans_presets.java:2396 +#: build/trans_presets.java:2510 +msgid "Reference number" +msgstr "Справочный номер" + +#. item "Car/Parking" combo "Type" +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "многоуровневая" + +#: build/trans_presets.java:1392 +msgid "surface" +msgstr "наземная" + +#: build/trans_presets.java:1392 +msgid "underground" +msgstr "подземная" + +#: build/trans_presets.java:1393 +#, fuzzy +msgid "Park and Ride" +msgstr "перехватывающая" + +#. item "Tourism/Information Terminal" text "Reference number" +#. item "Tourism/Audioguide" text "Reference number" +#. item "Amenities/Toilets" text "Reference number" +#: build/trans_presets.java:1394 build/trans_presets.java:1763 +#: build/trans_presets.java:1773 build/trans_presets.java:2397 +msgid "Fee" +msgstr "Денежный сбор" + +#. +#: build/trans_presets.java:1396 +#, fuzzy +msgid "Capacity (overall)" +msgstr "Вместимость" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 +msgid "Spaces for Disabled" +msgstr "Места для инвалидов" + +#: build/trans_presets.java:1398 +#, fuzzy +msgid "Spaces for Women" +msgstr "Места для инвалидов" + +#: build/trans_presets.java:1399 +#, fuzzy +msgid "Spaces for Parents" +msgstr "Места для инвалидов" + +#: build/trans_presets.java:1400 +msgid "See the Wiki for other capacity:[types]=*." +msgstr "" + +#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*." +#: build/trans_presets.java:1402 +msgid "Wash" +msgstr "Мойка" + +#. item +#: build/trans_presets.java:1403 +msgid "Edit Car Wash" +msgstr "Править автомойку" + +#. item "Car/Wash" text "Operator" +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1408 build/trans_presets.java:1452 +msgid "Shop" +msgstr "Магазин" + +#. item +#. +#: build/trans_presets.java:1410 +msgid "Edit Car Shop" +msgstr "Править автомагазин" + +#. item "Car/Shop" text "Operator" +#: build/trans_presets.java:1415 +msgid "Repair" +msgstr "Мастерская" + +#. item +#: build/trans_presets.java:1416 +msgid "Edit Car Repair" +msgstr "Править автомастерскую" + +#. item "Car/Repair" text "Operator" +#. item "Bicycle/Parking" text "Capacity" +#: build/trans_presets.java:1421 build/trans_presets.java:1445 +msgid "Rental" +msgstr "Прокат" + +#. item +#. +#: build/trans_presets.java:1424 +msgid "Edit Car Rental" +msgstr "Править прокат авто" + +#. item "Car/Rental" text "Operator" +#: build/trans_presets.java:1429 +msgid "Sharing" +msgstr "Совместное использование" + +#. item +#. +#: build/trans_presets.java:1431 +msgid "Edit Car Sharing" +msgstr "Править совместное использование" + +#. item +#. +#: build/trans_presets.java:1440 +msgid "Edit Bicycle Parking" +msgstr "Править стоянку для велосипедов" + #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 +#: build/trans_presets.java:1443 msgid "Capacity" msgstr "Вместимость" -#. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 -msgid "surface" -msgstr "наземная" - -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "многоуровневая" - -#: build/trans_presets.java:1386 -msgid "underground" -msgstr "подземная" - -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "перехватывающая" - -#: build/trans_presets.java:1387 -msgid "Spaces for Disabled" -msgstr "Места для инвалидов" - -#. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1388 build/trans_presets.java:2328 -msgid "Fee" -msgstr "Денежный сбор" - -#. item "Car/Parking" check "Fee" -#: build/trans_presets.java:1390 -msgid "Wash" -msgstr "Мойка" - -#. item -#: build/trans_presets.java:1391 -msgid "Edit Car Wash" -msgstr "Править автомойку" - -#. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 -msgid "Shop" -msgstr "Магазин" - -#. item -#. -#: build/trans_presets.java:1398 -msgid "Edit Car Shop" -msgstr "Править автомагазин" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 -msgid "Repair" -msgstr "Мастерская" - -#. item -#: build/trans_presets.java:1404 -msgid "Edit Car Repair" -msgstr "Править автомастерскую" - -#. item "Car/Repair" text "Operator" -#. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 -msgid "Rental" -msgstr "Прокат" - -#. item -#. -#: build/trans_presets.java:1412 -msgid "Edit Car Rental" -msgstr "Править прокат авто" - -#. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 -msgid "Sharing" -msgstr "Совместное использование" - -#. item -#. -#: build/trans_presets.java:1419 -msgid "Edit Car Sharing" -msgstr "Править совместное использование" - -#. item -#. -#: build/trans_presets.java:1428 -msgid "Edit Bicycle Parking" -msgstr "Править стоянку для велосипедов" - #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Править прокат велосипедов" @@ -15748,15 +17161,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Править веломастерскую" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Общественный транспорт" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "UIC-Справка" @@ -15764,5 +17177,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Полустанок" @@ -15770,5 +17183,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Править полустанок" @@ -15776,5 +17189,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Трамвайная остановка" @@ -15783,5 +17196,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Править трамвайную остановку" @@ -15789,5 +17202,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Ж/Д платформа" @@ -15796,5 +17209,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Править ж/д платформу" @@ -15806,5 +17219,5 @@ #. #. -#: build/trans_presets.java:1485 build/trans_presets.java:1527 +#: build/trans_presets.java:1497 build/trans_presets.java:1539 msgid "Reference (track number)" msgstr "Справка (номер платформы)" @@ -15812,10 +17225,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1487 build/trans_presets.java:1529 +#: build/trans_presets.java:1499 build/trans_presets.java:1541 msgid "Area" msgstr "Область" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1489 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Вход в метро" @@ -15824,10 +17237,10 @@ #. -#: build/trans_presets.java:1492 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Править вход в метро" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Кресло-каталка" @@ -15836,5 +17249,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Автовокзал" @@ -15843,5 +17256,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Править автовокзал" @@ -15849,5 +17262,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Автобусная остановка" @@ -15857,5 +17270,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Править автобусную остановку" @@ -15864,8 +17277,6 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#. item "Amenities/Hunting Stand" label "Edit Hunting Stand" -#. -#: build/trans_presets.java:1520 build/trans_presets.java:1722 -#: build/trans_presets.java:2368 +#: build/trans_presets.java:1532 build/trans_presets.java:1785 +#: build/trans_presets.java:2439 msgid "Shelter" msgstr "Навес" @@ -15873,10 +17284,10 @@ #. item "Public Transport/Bus Stop" check "Shelter" #. -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1535 msgid "Bus Platform" msgstr "Автобусная платформа" #. item -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1536 msgid "Edit Bus Platform" msgstr "Править автобусную платформу" @@ -15884,5 +17295,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Такси" @@ -15890,5 +17301,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Править стоянку такси" @@ -15896,5 +17307,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Аэропорт" @@ -15902,15 +17313,15 @@ #. item #. -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1553 msgid "Edit Airport" msgstr "Редактировать Аэродром" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1546 +#: build/trans_presets.java:1558 msgid "IATA" msgstr "Международная ассоциация воздушного транспорта" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "Международная организация гражданской авиации" @@ -15919,5 +17330,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Проживание" @@ -15929,5 +17340,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Гостиница" @@ -15936,15 +17347,15 @@ #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1568 msgid "Edit Hotel" msgstr "Править гостиницу" #. item "Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1559 +#: build/trans_presets.java:1571 msgid "Stars" msgstr "Звёзды" #. item "Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1573 msgid "Motel" msgstr "Мотель" @@ -15952,20 +17363,20 @@ #. item #. -#: build/trans_presets.java:1563 +#: build/trans_presets.java:1575 msgid "Edit Motel" msgstr "Править иотель" #. item "Accomodation/Motel" text "Name" -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1579 msgid "Guest House" msgstr "Домик для гостей" #. item -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1580 msgid "Edit Guest House" msgstr "Редактировать Домик для гостей" #. item "Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1584 msgid "Chalet" msgstr "Дача/Коттедж" @@ -15973,10 +17384,10 @@ #. item #. -#: build/trans_presets.java:1574 +#: build/trans_presets.java:1586 msgid "Edit Chalet" msgstr "Редактировать Дача/Коттедж" #. item "Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1590 msgid "Hostel" msgstr "Студенческое общежитие" @@ -15984,30 +17395,30 @@ #. item #. -#: build/trans_presets.java:1580 +#: build/trans_presets.java:1592 msgid "Edit Hostel" msgstr "Править студенческое общежитие" #. item "Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1584 +#: build/trans_presets.java:1596 msgid "Alpine Hut" msgstr "Альпийский шалаш" #. item -#: build/trans_presets.java:1585 +#: build/trans_presets.java:1597 msgid "Edit Alpine Hut" msgstr "Редактировать Альпийский шалаш" #. item "Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1602 msgid "Caravan Site" msgstr "Площадка для домов на колёсах" #. item -#: build/trans_presets.java:1591 +#: build/trans_presets.java:1603 msgid "Edit Caravan Site" msgstr "Править площадку для домов на колёсах" #. item "Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1607 msgid "Camping Site" msgstr "Кэмпинг" @@ -16015,10 +17426,10 @@ #. item #. -#: build/trans_presets.java:1597 +#: build/trans_presets.java:1609 msgid "Edit Camping Site" msgstr "Править кэмпинг" #. item "Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1602 +#: build/trans_presets.java:1614 msgid "Food+Drinks" msgstr "Питание" @@ -16029,5 +17440,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Ресторан" @@ -16035,5 +17446,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Править ресторан" @@ -16041,5 +17452,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "Cuisine" msgstr "Кухня" @@ -16047,61 +17458,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "italian" msgstr "итальянская" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "китайская" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" msgstr "пицца" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" msgstr "бургеры" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "greek" msgstr "греческая" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "немецкая" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "индийская" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "regional" msgstr "местная" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "kebab" msgstr "кебаб" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "turkish" msgstr "турецкая" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "азиатская" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "тайская" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "мексиканская" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "японская" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "Фастфуд" @@ -16109,9 +17520,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Правка фастфуда" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Кафе" @@ -16119,10 +17530,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Править кафе" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "Бар" @@ -16130,20 +17540,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Править бар" -#. item "Food+Drinks/Pub" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1645 msgid "Biergarten" msgstr "Пивная" #. item -#: build/trans_presets.java:1630 +#: build/trans_presets.java:1646 msgid "Edit Biergarten" msgstr "Править пивную" -#. item "Food+Drinks/Biergarten" text "Name" -#: build/trans_presets.java:1634 +#: build/trans_presets.java:1651 msgid "Bar" msgstr "Закусочная" @@ -16151,10 +17559,9 @@ #. item #. -#: build/trans_presets.java:1636 +#: build/trans_presets.java:1653 msgid "Edit Bar" msgstr "Редактировать Закусочная" -#. item "Food+Drinks/Bar" text "Name" -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1658 msgid "Nightclub" msgstr "Ночной клуб" @@ -16162,33 +17569,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "Править ночной клуб" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Туризм" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "Достопримечательность" #. item -#: build/trans_presets.java:1649 +#: build/trans_presets.java:1668 msgid "Edit Attraction" msgstr "Править достопримечательность" -#. item "Tourism/Attraction" text "Name" -#. item "Tourism/Information Office" text "Name" -#. item "Amenities/Baby Hatch" text "Operator" -#: build/trans_presets.java:1652 build/trans_presets.java:1692 -#: build/trans_presets.java:2392 -msgid "Opening Hours" -msgstr "Часы работы" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Музей" @@ -16196,10 +17594,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Править музей" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Зоопарк" @@ -16208,10 +17605,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Править зоопарк" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Смотровая площадка" @@ -16219,25 +17615,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Править смотровую площадку" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1672 +#: build/trans_presets.java:1693 msgid "Look-Out Tower" msgstr "Каланча" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1674 +#: build/trans_presets.java:1695 msgid "Theme Park" msgstr "Парк развлечений" #. item -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1696 msgid "Edit Theme Park" msgstr "Править парк развлечений" -#. item "Tourism/Theme Park" text "Name" -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1701 msgid "Artwork" msgstr "Рисунки" @@ -16245,5 +17640,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Редактировать рисунки" @@ -16251,86 +17646,211 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1686 +#: build/trans_presets.java:1708 msgid "Information Office" msgstr "Справочное бюро" -#. item -#. -#: build/trans_presets.java:1688 -msgid "Edit Information Office" -msgstr "Править справочное бюро" - -#. item "Tourism/Information Office" text "Opening Hours" -#: build/trans_presets.java:1694 +#: build/trans_presets.java:1715 msgid "Map" msgstr "Карта" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1698 -msgid "Map Type" -msgstr "Тип карты" - -#. item "Tourism/Map" combo "Map Type" -#: build/trans_presets.java:1698 -msgid "map" -msgstr "карта" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "карта города" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "карта туристических маршрутов" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "карта велодорожек" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "Стоп" + +#. color tertiary +#. +#. 1 +#. 30000 +#. +#. +#. +#. +#. color deprecated +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. color highway_track +#. +#. 1 +#. 20000 +#. +#. +#. +#. +#. color street +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#: build/trans_presets.java:1720 build/trans_style.java:619 +#: build/trans_style.java:635 build/trans_style.java:651 +#: build/trans_style.java:659 +msgid "street" +msgstr "улица" + +#: build/trans_presets.java:1720 +#, fuzzy +msgid "scheme" +msgstr "китайская" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Область для скачивания" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Вставить" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "Город (более 100 000)" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "местная" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1699 build/trans_presets.java:1706 -#: build/trans_presets.java:1719 +#: build/trans_presets.java:1722 build/trans_presets.java:1738 +#: build/trans_presets.java:1782 msgid "Closer Description" msgstr "Ближайшее описание" #. item "Tourism/Map" text "Closer Description" -#: build/trans_presets.java:1701 +#. +#. item "Tourism/Guidepost" text "Elevation" +#. +#: build/trans_presets.java:1724 build/trans_presets.java:1747 +msgid "Routes shown for:" +msgstr "" + +#. item "Tourism/Map" check "Hiking" +#. item "Tourism/Guidepost" check "Hiking" +#: build/trans_presets.java:1726 build/trans_presets.java:1749 +#: build/trans_presets.java:1955 +msgid "Cycling" +msgstr "Велоспорт" + +#. item "Tourism/Map" check "Cycling" +#. item "Tourism/Guidepost" check "Cycling" +#: build/trans_presets.java:1727 build/trans_presets.java:1750 +#, fuzzy +msgid "Mountainbiking" +msgstr "Горный туризм" + +#. item "Tourism/Map" check "Mountainbiking" +#. item "Tourism/Guidepost" check "Mountainbiking" +#: build/trans_presets.java:1728 build/trans_presets.java:1751 +#: build/trans_presets.java:2009 +msgid "Skiing" +msgstr "Лыжный спорт" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "запасный путь" + +#. item "Tourism/Map" check "Riding" +#. item "Tourism/Guidepost" check "Riding" +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +msgid "... other transportation modes possible" +msgstr "" + +#. item "Tourism/Map" label "... other transportation modes possible" +#: build/trans_presets.java:1732 msgid "Information Board" msgstr "Информационный стенд" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1705 -msgid "Board Type" -msgstr "Тип Инфорационного Щита" - -#. item "Tourism/Information Board" combo "Board Type" -#: build/trans_presets.java:1705 -msgid "board" -msgstr "доска информации" - -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 +#, fuzzy +msgid "Board Content" +msgstr "Пограничный контороль" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "новичок" + +#: build/trans_presets.java:1737 msgid "history" msgstr "история" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "nature" msgstr "природа" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "wildlife" msgstr "животный мир" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "plants" +msgstr "землепользование" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" +#: build/trans_presets.java:1740 +#, fuzzy +msgid "Guidepost" msgstr "Столб с указателями (туризм)" -#. item "Tourism/Guidepost (Hiking)" text "Elevation" -#: build/trans_presets.java:1715 +#. item "Tourism/Guidepost" label "... other transportation modes possible" +#: build/trans_presets.java:1755 +#, fuzzy +msgid "Information Terminal" +msgstr "Информация" + +#. item "Tourism/Information Terminal" text "Name" +#. item "Tourism/Audioguide" text "Name" +#: build/trans_presets.java:1760 build/trans_presets.java:1770 +#, fuzzy +msgid "Closer description" +msgstr "Ближайшее описание" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Аудио" + +#. +#: build/trans_presets.java:1775 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" +#: build/trans_presets.java:1776 +#, fuzzy +msgid "Phone number" +msgstr "Номер телефона" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1778 msgid "Other Information Points" msgstr "Другие Информационные точки" #. item -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1786 msgid "Edit Shelter" msgstr "Править навес" @@ -16338,25 +17858,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1726 build/trans_presets.java:1732 +#: build/trans_presets.java:1789 build/trans_presets.java:1795 msgid "Fireplace" msgstr "Очаг" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1728 +#: build/trans_presets.java:1791 msgid "Picnic Site" msgstr "Место для пикника" #. item -#: build/trans_presets.java:1729 +#: build/trans_presets.java:1792 msgid "Edit Picnic Site" msgstr "Править место для пикника" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1798 msgid "Historic Places" msgstr "Исторические места" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Замок" @@ -16365,20 +17885,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Править замок" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Руины" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Править руины" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Место раскопок" @@ -16387,10 +17906,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Править место раскопок" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "Поле битвы" @@ -16398,5 +17916,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Править поле битвы" @@ -16404,15 +17922,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Памятник" #. item -#: build/trans_presets.java:1763 +#: build/trans_presets.java:1828 msgid "Edit Monument" msgstr "Править памятник" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1767 +#: build/trans_presets.java:1832 msgid "Memorial" msgstr "Мемориал" @@ -16420,45 +17938,45 @@ #. item #. -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1834 msgid "Edit Memorial" msgstr "Править мемориал" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1773 +#: build/trans_presets.java:1838 msgid "Wayside Cross" msgstr "Придорожный крест" #. item -#: build/trans_presets.java:1774 +#: build/trans_presets.java:1839 msgid "Edit Wayside Cross" msgstr "Править придорожный крест" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1778 +#: build/trans_presets.java:1843 msgid "Wayside Shrine" msgstr "Придорожная святыня" #. item -#: build/trans_presets.java:1779 +#: build/trans_presets.java:1844 msgid "Edit Wayside Shrine" msgstr "Править придорожную святыню" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1784 +#: build/trans_presets.java:1849 msgid "Leisure" msgstr "Досуг" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Аквапарк" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Править аквапарк" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Игровая площадка" @@ -16466,15 +17984,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Править игровую площадку" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Рыбалка" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Править рыбалку" @@ -16482,15 +18000,15 @@ #. item "Leisure/Fishing" text "Name" #. -#: build/trans_presets.java:1803 +#: build/trans_presets.java:1868 msgid "Sport Facilities" msgstr "Спортивные учреждения" #. group "Sport Facilities" -#: build/trans_presets.java:1804 +#: build/trans_presets.java:1869 msgid "Stadium" msgstr "Стадион" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Править стадион" @@ -16504,6 +18022,6 @@ #. item "Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_presets.java:1827 build/trans_presets.java:1836 +#: build/trans_presets.java:1874 build/trans_presets.java:1883 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 msgid "select sport:" msgstr "вид спорта:" @@ -16895,30 +18413,30 @@ #. #. -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 build/trans_style.java:3653 -#: build/trans_style.java:3661 build/trans_style.java:3669 -#: build/trans_style.java:3677 build/trans_style.java:3685 -#: build/trans_style.java:3693 build/trans_style.java:3701 -#: build/trans_style.java:3709 build/trans_style.java:3717 -#: build/trans_style.java:3725 build/trans_style.java:3733 -#: build/trans_style.java:3741 build/trans_style.java:3749 -#: build/trans_style.java:3757 build/trans_style.java:3765 -#: build/trans_style.java:3773 build/trans_style.java:3781 -#: build/trans_style.java:3789 build/trans_style.java:3797 -#: build/trans_style.java:3805 build/trans_style.java:3813 -#: build/trans_style.java:3821 build/trans_style.java:3829 -#: build/trans_style.java:3837 build/trans_style.java:3845 -#: build/trans_style.java:3853 build/trans_style.java:3861 -#: build/trans_style.java:3869 build/trans_style.java:3877 -#: build/trans_style.java:3885 build/trans_style.java:3893 -#: build/trans_style.java:3901 build/trans_style.java:3909 -#: build/trans_style.java:3917 build/trans_style.java:3925 -#: build/trans_style.java:3933 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_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 +#: 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 build/trans_style.java:3892 +#: build/trans_style.java:3900 build/trans_style.java:3908 +#: build/trans_style.java:3916 build/trans_style.java:3924 +#: build/trans_style.java:3932 msgid "sport" msgstr "спорт" @@ -16928,227 +18446,225 @@ #. item "Sport Facilities/Pitch" combo "sport" #. item "Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "multi" msgstr "несколько" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "archery" msgstr "стрельба из лука" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "athletics" msgstr "атлетика" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "australian_football" msgstr "австралийский футбол" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "baseball" msgstr "бейсбол" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "basketball" msgstr "баскетбол" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "boules" msgstr "ж/д пути" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "bowls" msgstr "изгибаться" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "canoe" msgstr "каноэ" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "climbing" msgstr "альпинизм" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "cricket" msgstr "крикет" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "cricket_nets" msgstr "крикет_сеть" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "croquet" msgstr "крокет" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "cycling" msgstr "велоспорт" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "dog_racing" msgstr "собачьи бега" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "equestrian" msgstr "наездник" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "football" msgstr "футбол" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "golf" msgstr "гольф" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "gymnastics" msgstr "гимнастика" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "hockey" msgstr "хоккей" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "horse_racing" msgstr "лошадиные бега" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "motor" msgstr "машина" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "pelota" msgstr "пелота" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "racquet" msgstr "производить шум" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "rugby" msgstr "рэгби" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "shooting" msgstr "стрельба" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "skateboard" msgstr "скейтборд" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "skating" msgstr "фигурное катание" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "skiing" msgstr "лыжный спорт" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "soccer" msgstr "футбол" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "swimming" msgstr "плаванье" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "table_tennis" msgstr "настольный теннис" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "tennis" msgstr "теннис" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "Спортивный центр" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Править спортивный центр" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1887 msgid "Pitch" msgstr "Спортивное поле" #. item -#: build/trans_presets.java:1823 +#: build/trans_presets.java:1888 msgid "Edit Pitch" msgstr "Править спортивное поле" -#: build/trans_presets.java:1831 +#: build/trans_presets.java:1896 msgid "Racetrack" msgstr "Трек" #. item -#: build/trans_presets.java:1832 +#: build/trans_presets.java:1897 msgid "Edit Racetrack" msgstr "Править трек" -#: build/trans_presets.java:1840 +#: build/trans_presets.java:1905 msgid "Golf Course" msgstr "Поле для гольфа" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Править поле для гольфа" -#. item "Sport Facilities/Golf Course" text "Name" -#: build/trans_presets.java:1845 +#: build/trans_presets.java:1911 msgid "Miniature Golf" msgstr "Минигольф" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Править минигольф" -#. item "Sport Facilities/Miniature Golf" text "Name" -#: build/trans_presets.java:1851 +#: build/trans_presets.java:1918 msgid "Sport" msgstr "Спорт" #. group "Sport" -#: build/trans_presets.java:1852 +#: build/trans_presets.java:1919 msgid "Multi" msgstr "Несколько" #. item -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1920 msgid "Edit Multi" msgstr "Править несколько видов спорта" @@ -17187,248 +18703,240 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1856 build/trans_presets.java:1862 -#: build/trans_presets.java:1868 build/trans_presets.java:1874 -#: build/trans_presets.java:1880 build/trans_presets.java:1886 -#: build/trans_presets.java:1892 build/trans_presets.java:1898 -#: build/trans_presets.java:1904 build/trans_presets.java:1910 -#: build/trans_presets.java:1916 build/trans_presets.java:1922 -#: build/trans_presets.java:1928 build/trans_presets.java:1934 -#: build/trans_presets.java:1940 build/trans_presets.java:1949 -#: build/trans_presets.java:1956 build/trans_presets.java:1964 -#: build/trans_presets.java:1970 build/trans_presets.java:1976 -#: build/trans_presets.java:1982 build/trans_presets.java:1988 -#: build/trans_presets.java:1994 build/trans_presets.java:2000 -#: build/trans_presets.java:2006 build/trans_presets.java:2012 -#: build/trans_presets.java:2018 build/trans_presets.java:2024 -#: build/trans_presets.java:2030 build/trans_presets.java:2036 -#: build/trans_presets.java:2042 build/trans_presets.java:2048 -#: build/trans_presets.java:2054 build/trans_presets.java:2060 +#: build/trans_presets.java:1923 build/trans_presets.java:1929 +#: build/trans_presets.java:1935 build/trans_presets.java:1941 +#: build/trans_presets.java:1947 build/trans_presets.java:1953 +#: build/trans_presets.java:1959 build/trans_presets.java:1965 +#: build/trans_presets.java:1971 build/trans_presets.java:1977 +#: build/trans_presets.java:1983 build/trans_presets.java:1989 +#: build/trans_presets.java:1995 build/trans_presets.java:2001 +#: build/trans_presets.java:2007 build/trans_presets.java:2016 +#: build/trans_presets.java:2023 build/trans_presets.java:2031 +#: build/trans_presets.java:2037 build/trans_presets.java:2043 +#: build/trans_presets.java:2049 build/trans_presets.java:2055 +#: build/trans_presets.java:2061 build/trans_presets.java:2067 +#: build/trans_presets.java:2073 build/trans_presets.java:2079 +#: build/trans_presets.java:2085 build/trans_presets.java:2091 +#: build/trans_presets.java:2097 build/trans_presets.java:2103 +#: build/trans_presets.java:2109 build/trans_presets.java:2115 +#: build/trans_presets.java:2121 build/trans_presets.java:2127 msgid "pitch" msgstr "спортивное поле" -#: build/trans_presets.java:1856 build/trans_presets.java:1862 -#: build/trans_presets.java:1868 build/trans_presets.java:1874 -#: build/trans_presets.java:1880 build/trans_presets.java:1886 -#: build/trans_presets.java:1892 build/trans_presets.java:1898 -#: build/trans_presets.java:1904 build/trans_presets.java:1910 -#: build/trans_presets.java:1916 build/trans_presets.java:1922 -#: build/trans_presets.java:1928 build/trans_presets.java:1934 -#: build/trans_presets.java:1940 build/trans_presets.java:1949 -#: build/trans_presets.java:1956 build/trans_presets.java:1964 -#: build/trans_presets.java:1970 build/trans_presets.java:1976 -#: build/trans_presets.java:1982 build/trans_presets.java:1988 -#: build/trans_presets.java:1994 build/trans_presets.java:2000 -#: build/trans_presets.java:2006 build/trans_presets.java:2012 -#: build/trans_presets.java:2018 build/trans_presets.java:2024 -#: build/trans_presets.java:2030 build/trans_presets.java:2036 -#: build/trans_presets.java:2042 build/trans_presets.java:2048 -#: build/trans_presets.java:2054 build/trans_presets.java:2060 +#: build/trans_presets.java:1923 build/trans_presets.java:1929 +#: build/trans_presets.java:1935 build/trans_presets.java:1941 +#: build/trans_presets.java:1947 build/trans_presets.java:1953 +#: build/trans_presets.java:1959 build/trans_presets.java:1965 +#: build/trans_presets.java:1971 build/trans_presets.java:1977 +#: build/trans_presets.java:1983 build/trans_presets.java:1989 +#: build/trans_presets.java:1995 build/trans_presets.java:2001 +#: build/trans_presets.java:2007 build/trans_presets.java:2016 +#: build/trans_presets.java:2023 build/trans_presets.java:2031 +#: build/trans_presets.java:2037 build/trans_presets.java:2043 +#: build/trans_presets.java:2049 build/trans_presets.java:2055 +#: build/trans_presets.java:2061 build/trans_presets.java:2067 +#: build/trans_presets.java:2073 build/trans_presets.java:2079 +#: build/trans_presets.java:2085 build/trans_presets.java:2091 +#: build/trans_presets.java:2097 build/trans_presets.java:2103 +#: build/trans_presets.java:2109 build/trans_presets.java:2115 +#: build/trans_presets.java:2121 build/trans_presets.java:2127 msgid "sports_centre" msgstr "спортивный центр" -#: build/trans_presets.java:1856 build/trans_presets.java:1862 -#: build/trans_presets.java:1868 build/trans_presets.java:1874 -#: build/trans_presets.java:1880 build/trans_presets.java:1886 -#: build/trans_presets.java:1892 build/trans_presets.java:1898 -#: build/trans_presets.java:1904 build/trans_presets.java:1910 -#: build/trans_presets.java:1916 build/trans_presets.java:1922 -#: build/trans_presets.java:1928 build/trans_presets.java:1934 -#: build/trans_presets.java:1940 build/trans_presets.java:1949 -#: build/trans_presets.java:1956 build/trans_presets.java:1964 -#: build/trans_presets.java:1970 build/trans_presets.java:1976 -#: build/trans_presets.java:1982 build/trans_presets.java:1988 -#: build/trans_presets.java:1994 build/trans_presets.java:2000 -#: build/trans_presets.java:2006 build/trans_presets.java:2012 -#: build/trans_presets.java:2018 build/trans_presets.java:2024 -#: build/trans_presets.java:2030 build/trans_presets.java:2036 -#: build/trans_presets.java:2042 build/trans_presets.java:2048 -#: build/trans_presets.java:2054 build/trans_presets.java:2060 +#: build/trans_presets.java:1923 build/trans_presets.java:1929 +#: build/trans_presets.java:1935 build/trans_presets.java:1941 +#: build/trans_presets.java:1947 build/trans_presets.java:1953 +#: build/trans_presets.java:1959 build/trans_presets.java:1965 +#: build/trans_presets.java:1971 build/trans_presets.java:1977 +#: build/trans_presets.java:1983 build/trans_presets.java:1989 +#: build/trans_presets.java:1995 build/trans_presets.java:2001 +#: build/trans_presets.java:2007 build/trans_presets.java:2016 +#: build/trans_presets.java:2023 build/trans_presets.java:2031 +#: build/trans_presets.java:2037 build/trans_presets.java:2043 +#: build/trans_presets.java:2049 build/trans_presets.java:2055 +#: build/trans_presets.java:2061 build/trans_presets.java:2067 +#: build/trans_presets.java:2073 build/trans_presets.java:2079 +#: build/trans_presets.java:2085 build/trans_presets.java:2091 +#: build/trans_presets.java:2097 build/trans_presets.java:2103 +#: build/trans_presets.java:2109 build/trans_presets.java:2115 +#: build/trans_presets.java:2121 build/trans_presets.java:2127 msgid "stadium" msgstr "стадион" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "10штырьковый" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "Редактировать 10 пин" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1931 msgid "Athletics" msgstr "Атлетика" #. item -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1932 msgid "Edit Athletics" msgstr "Править атлетику" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1937 msgid "Archery" msgstr "Стрельба из лука" #. item -#: build/trans_presets.java:1871 +#: build/trans_presets.java:1938 msgid "Edit Archery" msgstr "Править стрельбу из лука" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1943 msgid "Climbing" msgstr "Скалолазанье" #. item -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1944 msgid "Edit Climbing" msgstr "Править скалолазанье" -#: build/trans_presets.java:1882 +#: build/trans_presets.java:1949 msgid "Canoeing" msgstr "Каноэ" #. item -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1950 msgid "Edit Canoeing" msgstr "Править каноэ" -#: build/trans_presets.java:1888 -msgid "Cycling" -msgstr "Велоспорт" - -#. item -#: build/trans_presets.java:1889 +#. item +#: build/trans_presets.java:1956 msgid "Edit Cycling" msgstr "Править велоспорт" -#: build/trans_presets.java:1894 +#: build/trans_presets.java:1961 msgid "Dog Racing" msgstr "Собачьи бега" #. item -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1962 msgid "Edit Dog Racing" msgstr "Править собачьи бега" -#: build/trans_presets.java:1900 +#: build/trans_presets.java:1967 msgid "Equestrian" msgstr "Наездник" #. item -#: build/trans_presets.java:1901 +#: build/trans_presets.java:1968 msgid "Edit Equestrian" msgstr "Редактировать Наездник" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1973 msgid "Horse Racing" msgstr "Лошадиные бега" #. item -#: build/trans_presets.java:1907 +#: build/trans_presets.java:1974 msgid "Edit Horse Racing" msgstr "Править лошадиные бега" -#: build/trans_presets.java:1912 +#: build/trans_presets.java:1979 msgid "Gymnastics" msgstr "Гимнастика" #. item -#: build/trans_presets.java:1913 +#: build/trans_presets.java:1980 msgid "Edit Gymnastics" msgstr "Править гимнастику" -#: build/trans_presets.java:1918 +#: build/trans_presets.java:1985 msgid "Motor Sports" msgstr "Моторные виды спорта" #. item -#: build/trans_presets.java:1919 +#: build/trans_presets.java:1986 msgid "Edit Motor Sports" msgstr "Править моторные виды спорта" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1991 msgid "Skating" msgstr "Фигурное катание" #. item -#: build/trans_presets.java:1925 +#: build/trans_presets.java:1992 msgid "Edit Skating" msgstr "Править фигурное катание" -#: build/trans_presets.java:1930 +#: build/trans_presets.java:1997 msgid "Skateboard" msgstr "Скейтборд" #. item -#: build/trans_presets.java:1931 +#: build/trans_presets.java:1998 msgid "Edit Skateboard" msgstr "Править скейтборд" -#: build/trans_presets.java:1936 +#: build/trans_presets.java:2003 msgid "Swimming" msgstr "Плавание" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "Править плаванье" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "Лыжный спорт" - #. item #. -#: build/trans_presets.java:1944 +#: build/trans_presets.java:2011 msgid "Edit Skiing" msgstr "Править лыжный сопрт" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "Piste type" msgstr "Тип лыжня" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "downhill" msgstr "спуск" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "nordic" msgstr "лыжный спорт" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "snow_park" msgstr "снежный городок" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "Difficulty" msgstr "Сложность" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "novice" msgstr "новичок" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "easy" msgstr "лёгкий" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "intermediate" msgstr "Промежуточный" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "advanced" msgstr "улучшенный" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "expert" msgstr "эксперт" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "freeride" msgstr "свободный" -#: build/trans_presets.java:1951 +#: build/trans_presets.java:2018 msgid "Shooting" msgstr "Стрельба" @@ -17436,178 +18944,178 @@ #. item #. -#: build/trans_presets.java:1953 +#: build/trans_presets.java:2020 msgid "Edit Shooting" msgstr "Править стрельбу" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:2026 msgid "Sport (Ball)" msgstr "Спорт (с мячом)" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "Футбол" #. item -#: build/trans_presets.java:1961 +#: build/trans_presets.java:2028 msgid "Edit Soccer" msgstr "Править футбол" -#: build/trans_presets.java:1966 +#: build/trans_presets.java:2033 msgid "Football" msgstr "Американский футбол" #. item -#: build/trans_presets.java:1967 +#: build/trans_presets.java:2034 msgid "Edit Football" msgstr "Править американский футбол" -#: build/trans_presets.java:1972 +#: build/trans_presets.java:2039 msgid "Australian Football" msgstr "Австралийский футбол" #. item -#: build/trans_presets.java:1973 +#: build/trans_presets.java:2040 msgid "Edit Australian Football" msgstr "Править австралийский футбол" -#: build/trans_presets.java:1978 +#: build/trans_presets.java:2045 msgid "Baseball" msgstr "Бейсбол" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Править бейсбол" -#: build/trans_presets.java:1984 +#: build/trans_presets.java:2051 msgid "Basketball" msgstr "Баскетбол" #. item -#: build/trans_presets.java:1985 +#: build/trans_presets.java:2052 msgid "Edit Basketball" msgstr "Править баскетбол" -#: build/trans_presets.java:1990 +#: build/trans_presets.java:2057 msgid "Golf" msgstr "Гольф" #. item -#: build/trans_presets.java:1991 +#: build/trans_presets.java:2058 msgid "Edit Golf" msgstr "Править гольф" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:2061 msgid "golf_course" msgstr "поле для гольфа" -#: build/trans_presets.java:1996 +#: build/trans_presets.java:2063 msgid "Boule" msgstr "Рубин" #. item -#: build/trans_presets.java:1997 +#: build/trans_presets.java:2064 msgid "Edit Boule" msgstr "Редактировать Рубин" -#: build/trans_presets.java:2002 +#: build/trans_presets.java:2069 msgid "Bowls" msgstr "Стадион" #. item -#: build/trans_presets.java:2003 +#: build/trans_presets.java:2070 msgid "Edit Bowls" msgstr "Редактировать Стадион" -#: build/trans_presets.java:2008 +#: build/trans_presets.java:2075 msgid "Cricket" msgstr "Крикет" #. item -#: build/trans_presets.java:2009 +#: build/trans_presets.java:2076 msgid "Edit Cricket" msgstr "Редактировать Крикет" -#: build/trans_presets.java:2014 +#: build/trans_presets.java:2081 msgid "Cricket Nets" msgstr "Крикет сети" #. item -#: build/trans_presets.java:2015 +#: build/trans_presets.java:2082 msgid "Edit Cricket Nets" msgstr "Редактировать Крикет сети" -#: build/trans_presets.java:2020 +#: build/trans_presets.java:2087 msgid "Croquet" msgstr "Крокет" #. item -#: build/trans_presets.java:2021 +#: build/trans_presets.java:2088 msgid "Edit Croquet" msgstr "Редактировать Крокет" -#: build/trans_presets.java:2026 +#: build/trans_presets.java:2093 msgid "Hockey" msgstr "Хоккей" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Править хоккей" -#: build/trans_presets.java:2032 +#: build/trans_presets.java:2099 msgid "Pelota" msgstr "Пелота" #. item -#: build/trans_presets.java:2033 +#: build/trans_presets.java:2100 msgid "Edit Pelota" msgstr "Редактировать Пелота" -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2105 msgid "Racquet" msgstr "Ракетка" #. item -#: build/trans_presets.java:2039 +#: build/trans_presets.java:2106 msgid "Edit Racquet" msgstr "Редактировать Ракетка" -#: build/trans_presets.java:2044 +#: build/trans_presets.java:2111 msgid "Rugby" msgstr "Регби" #. item -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2112 msgid "Edit Rugby" msgstr "Править рэгби" -#: build/trans_presets.java:2050 +#: build/trans_presets.java:2117 msgid "Table Tennis" msgstr "Настольный теннис" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Править настольный теннис" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "Теннис" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Править теннис" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Здания" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Здание" @@ -17615,5 +19123,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Общественное здание" @@ -17621,10 +19129,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Править общественное здание" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "Муниципалитет" @@ -17632,10 +19140,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Править здание муниципалитета" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Посольство" @@ -17643,10 +19151,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Править посольство" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Здание суда" @@ -17655,10 +19163,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Править здание суда" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Тюрьма" @@ -17667,10 +19175,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Править тюрьму" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Полиция/Милиция" @@ -17680,10 +19188,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2104 +#: build/trans_presets.java:2171 msgid "Edit Police" msgstr "Править полицию" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Пожарное депо" @@ -17692,10 +19200,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Править пожарное депо" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Почтовое отделение" @@ -17703,5 +19211,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Править почтовое отделение" @@ -17709,15 +19217,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Детский сад" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Править детсад" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "Школа" @@ -17725,10 +19233,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Править школу" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "Университет" @@ -17736,10 +19244,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Править университет" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "Колледж" @@ -17747,5 +19255,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Править колледж" @@ -17753,5 +19261,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Кинотеатр" @@ -17760,10 +19268,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Править кинотеатр" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Библиотека" @@ -17772,10 +19280,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Править библиотеку" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "Центр искусств" @@ -17783,10 +19290,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "Править центр искусств" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "Театр" @@ -17795,10 +19302,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Править театр" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Место поклонения" @@ -17808,5 +19315,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2245 msgid "Edit Place of Worship" msgstr "Править место поклонения" @@ -17815,6 +19322,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "Religion" msgstr "Религия" @@ -17823,66 +19330,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "bahai" msgstr "Бахаи" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "buddhist" msgstr "Буддизм" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "christian" msgstr "Христианство" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "hindu" msgstr "Индуизм" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "jain" msgstr "Джайнизм" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "jewish" msgstr "Иудаизм" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "muslim" msgstr "Мусульманство" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "sikh" msgstr "сикхизм" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "spiritualist" msgstr "Спиритуализм" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "taoist" msgstr "Даосизм" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "unitarian" msgstr "унитарный" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "zoroastrian" msgstr "зороастризм" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "Denomination" msgstr "Конфессия" @@ -17891,81 +19398,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "anglican" msgstr "Англиканская" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "baptist" msgstr "Баптизм" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "catholic" msgstr "Католическая" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "evangelical" msgstr "Евангельская" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "jehovahs_witness" msgstr "Свидетели Иеговы" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "lutheran" msgstr "Лютеранство" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "methodist" msgstr "Методизм" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "mormon" msgstr "Мормон" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "orthodox" msgstr "Православие" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "pentecostal" msgstr "пятидесятник" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "presbyterian" msgstr "пресвитерианин" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "protestant" msgstr "Протестантизм" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "quaker" msgstr "квакер" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "shia" msgstr "шиизм" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "sunni" msgstr "суннизм" #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2253 msgid "Addresses" msgstr "Адреса" @@ -17974,5 +19481,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Править адреса" @@ -17980,5 +19487,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Номер дома" @@ -17986,20 +19493,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Название дома" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "Название города" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Почтовый индекс" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Код страны" @@ -18007,5 +19514,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Интерполяция адресов" @@ -18014,5 +19521,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Править интерполяцию адресов" @@ -18020,71 +19527,67 @@ #. item "Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "Numbering scheme" msgstr "Схема нумерации" #. item "Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "odd" msgstr "нечётные" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "чётные" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "все" - -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "alphabetic" msgstr "алфавитный" -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2275 msgid "Man Made" msgstr "Рукотворное" #. group "Man Made" -#: build/trans_presets.java:2207 +#: build/trans_presets.java:2276 msgid "Works" msgstr "Цеха" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Править цеха" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "Башня" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Править башню" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Водонапорная башня" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Править водонапорную башню" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "Газгольдер" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Править газгольдер" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "Маяк" @@ -18092,10 +19595,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Править маяк" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Ветряная мельница" @@ -18103,10 +19606,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Править ветряную мельницу" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Трубопровод" @@ -18114,10 +19617,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Править трубопровод" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "Очистные сооружения" @@ -18127,10 +19630,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2318 msgid "Edit Wastewater Plant" msgstr "Править очистные сооружения" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "Кран" @@ -18138,10 +19641,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Править кран" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "Буй" @@ -18149,10 +19652,10 @@ #. item #. -#: build/trans_presets.java:2261 +#: build/trans_presets.java:2330 msgid "Edit Beacon" msgstr "Править буй" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2265 +#: build/trans_presets.java:2334 msgid "Survey Point" msgstr "Точка наблюдений" @@ -18160,10 +19663,10 @@ #. item #. -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2336 msgid "Edit Survey Point" msgstr "Править точку наблюдений" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2340 msgid "Surveillance" msgstr "Видеонаблюдение" @@ -18171,5 +19674,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Править видеонаблюдение" @@ -18177,5 +19680,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Электростанция" @@ -18185,39 +19688,39 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2351 msgid "Edit Power Generator" msgstr "Править электростанцию" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "wind" msgstr "энергия ветра" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "энергия воды" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "энергия сгорания топлива" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "атомный" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "coal" msgstr "уголь" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "photovoltaic" msgstr "энергия солнца" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "gas" msgstr "газ" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "Электроподстанция" @@ -18226,10 +19729,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Править электроподстанцию" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "Трансформаторная будка" @@ -18238,5 +19741,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Править трансформатор" @@ -18244,10 +19747,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2300 build/trans_presets.java:2316 +#: build/trans_presets.java:2369 build/trans_presets.java:2385 msgid "Line reference" msgstr "электролиния" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2371 msgid "Power Tower" msgstr "Опора ЛЭП" @@ -18258,5 +19761,5 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2307 +#: build/trans_presets.java:2376 msgid "Edit Power Tower" msgstr "Править опору ЛЭП" @@ -18264,5 +19767,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Линия электропередач" @@ -18271,46 +19774,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Править линию электропередач" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Напряжение" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Количество кабелей" #. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2390 msgid "Amenities" msgstr "Удобства" #. group "Amenities" -#: build/trans_presets.java:2322 +#: build/trans_presets.java:2391 msgid "Toilets" msgstr "Туалеты" -#. item "Amenities/Toilets" text "Operator" -#. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:2327 build/trans_presets.java:2419 -msgid "Reference number" -msgstr "Справочный номер" - #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2329 build/trans_presets.java:2420 +#: build/trans_presets.java:2398 build/trans_presets.java:2511 msgid "Note" msgstr "Примечание" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2400 msgid "Post Box" msgstr "Почтовый ящик" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Телефон" @@ -18319,5 +19816,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Править телефон" @@ -18325,5 +19822,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2342 build/trans_presets.java:2421 +#: build/trans_presets.java:2411 build/trans_presets.java:2512 msgid "Coins" msgstr "Монеты" @@ -18331,5 +19828,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2343 build/trans_presets.java:2422 +#: build/trans_presets.java:2412 build/trans_presets.java:2513 msgid "Notes" msgstr "Банкноты" @@ -18337,5 +19834,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2344 build/trans_presets.java:2423 +#: build/trans_presets.java:2413 build/trans_presets.java:2514 msgid "Electronic purses and Charge cards" msgstr "Электронные средства оплаты" @@ -18343,5 +19840,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2345 build/trans_presets.java:2424 +#: build/trans_presets.java:2414 build/trans_presets.java:2515 msgid "Debit cards" msgstr "Дебитные карты" @@ -18349,15 +19846,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2346 build/trans_presets.java:2425 +#: build/trans_presets.java:2415 build/trans_presets.java:2516 msgid "Credit cards" msgstr "Кредитные карты" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Телефонные карты" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Переработка отходов" @@ -18366,5 +19863,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Править переработку отходов" @@ -18372,80 +19869,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Батарейки" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "Консервные банки" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "Одежда" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Стекло" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Бумага" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Металлолом" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "Скамейка" -#. item -#. -#. -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2435 msgid "Hunting Stand" msgstr "Охотничий стенд" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Править охотничий стенд" -#. item "Amenities/Hunting Stand" check "Shelter" -#: build/trans_presets.java:2369 +#. item "Amenities/Hunting Stand" label "Edit Hunting Stand" +#. +#. item "Land use/Tree" text "Type" +#: build/trans_presets.java:2438 build/trans_presets.java:2899 +msgid "Height" +msgstr "Высота" + +#. item "Amenities/Hunting Stand" combo "Height" +#: build/trans_presets.java:2438 +msgid "low" +msgstr "низкий" + +#: build/trans_presets.java:2438 +msgid "half" +msgstr "средний" + +#: build/trans_presets.java:2438 +msgid "full" +msgstr "полный" + +#: build/trans_presets.java:2440 msgid "Hide" msgstr "Укрытие" -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2441 msgid "Lock" msgstr "Заблокирован" -#. item "Amenities/Hunting Stand" check "Lock" -#. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2371 build/trans_presets.java:2771 -msgid "Height" -msgstr "Высота" - -#. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 -msgid "low" -msgstr "низкий" - -#: build/trans_presets.java:2371 -msgid "half" -msgstr "средний" - -#: build/trans_presets.java:2371 -msgid "full" -msgstr "полный" - -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Фонтан" @@ -18454,10 +19947,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Править фонтан" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "Питьевая вода" @@ -18466,10 +19959,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Править источник воды" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "Детская комната" @@ -18477,25 +19970,35 @@ #. item #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2459 msgid "Edit Baby Hatch" msgstr "Редактировать Детская комната" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2465 msgid "Shops" msgstr "Магазины" #. group "Shops" -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2466 msgid "Supermarket" msgstr "Супермаркет" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Править супермаркет" -#. item "Shops/Supermarket" text "Name" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2472 +#, fuzzy +msgid "Chemist" +msgstr "Дача/Коттедж" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Редактировать Дача/Коттедж" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "Продуктовый магазин" @@ -18503,10 +20006,9 @@ #. item #. -#: build/trans_presets.java:2403 +#: build/trans_presets.java:2480 msgid "Edit Convenience Store" msgstr "Править продуктовый магазин" -#. item "Shops/Convenience Store" text "Name" -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2485 msgid "Kiosk" msgstr "Киоск" @@ -18514,10 +20016,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Править киоск" -#. item "Shops/Kiosk" text "Name" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2492 +msgid "Book Store" +msgstr "" + +#. item +#: build/trans_presets.java:2493 +#, fuzzy +msgid "Edit Book Store" +msgstr "Править автобусную остановку" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Править дерево" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "Торговый автомат" @@ -18525,5 +20046,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Править торговый автомат" @@ -18531,88 +20052,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Реализуемая продукция" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_tickets" msgstr "билеты на общественный транспорт" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_plans" msgstr "план общественного транспорта" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "parking_tickets" msgstr "билеты на парковку" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "food" msgstr "еда" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "drinks" msgstr "напитки" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "sweets" msgstr "сладости" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "cigarettes" msgstr "сигареты" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "photos" msgstr "фотографии" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "animal_food" msgstr "еда для животных" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "news_papers" msgstr "газеты" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "игрушки" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "stamps" msgstr "марки" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "SIM-cards" msgstr "SIM-карты" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "telephone_vouchers" msgstr "телефонные ваучеры" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "vouchers" msgstr "ваучеры" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "condoms" msgstr "презервативы" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "tampons" msgstr "тампоны" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "excrement_bags" msgstr "пакеты для экскрементов" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2517 msgid "Account or loyalty cards" msgstr "Счета или карты лояльности" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2519 msgid "Butcher" msgstr "Мясная лавка" @@ -18620,10 +20141,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Править мясную лавку" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Булочная" @@ -18631,10 +20151,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Править булочную" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "Флорист" @@ -18642,20 +20161,18 @@ #. item #. -#: build/trans_presets.java:2442 +#: build/trans_presets.java:2535 msgid "Edit Florist" msgstr "Редактировать флориста" -#. item "Shops/Florist" text "Name" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2540 msgid "Organic" msgstr "Цветочный" #. item -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2541 msgid "Edit Organic Shop" msgstr "Редактировать Цветочный Магазин" -#. item "Shops/Organic" text "Name" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2546 msgid "Alcohol" msgstr "Алкоголь" @@ -18663,60 +20180,54 @@ #. item #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2548 msgid "Edit Alcohol Shop" msgstr "Редактировать магазин алкогольной продукции" -#. item "Shops/Alcohol" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2553 msgid "Beverages" msgstr "Напитки" #. item -#: build/trans_presets.java:2458 +#: build/trans_presets.java:2554 msgid "Edit Beverages Shop" msgstr "Редактировать магазин напитков" -#. item "Shops/Beverages" text "Name" -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2559 msgid "Computer" msgstr "Компьютер" #. item -#: build/trans_presets.java:2463 +#: build/trans_presets.java:2560 msgid "Edit Computer Shop" msgstr "Редактировать магазин компьютеров" -#. item "Shops/Computer" text "Name" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2565 msgid "Electronics" msgstr "Электроника" #. item -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2566 msgid "Edit Electronics Shop" msgstr "Редактиновать Магазан электрнонной техники" -#. item "Shops/Electronics" text "Name" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2571 msgid "Hifi" msgstr "Звуковая аппаратура" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "Редактировать Магазин звуковой аппаратуры" -#. item "Shops/Hifi" text "Name" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2577 msgid "Furniture" msgstr "Мебельный" #. item -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2578 msgid "Edit Furniture Shop" msgstr "Править мебельный магазин" -#. item "Shops/Furniture" text "Name" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2583 msgid "Garden Centre" msgstr "Садовый магазин" @@ -18724,10 +20235,9 @@ #. item #. -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2585 msgid "Edit Garden Centre" msgstr "Редактировать Садовый магазин" -#. item "Shops/Garden Centre" text "Name" -#: build/trans_presets.java:2488 +#: build/trans_presets.java:2590 msgid "Hardware" msgstr "Оборудование" @@ -18735,10 +20245,9 @@ #. item #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2592 msgid "Edit Hardware Store" msgstr "Редактировать Магазин оборудования" -#. item "Shops/Hardware" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2597 msgid "Do-it-yourself-store" msgstr "Строительный магазин" @@ -18746,60 +20255,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "Править строительный магазин" -#. item "Shops/Do-it-yourself-store" text "Name" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2604 msgid "Stationery" msgstr "Канцтовары" #. item -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2605 msgid "Edit Stationery Shop" msgstr "Редактировать Магазин Канцтоваров" -#. item "Shops/Stationery" text "Name" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2610 msgid "Hairdresser" msgstr "Парикмахерская" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Править парихмахерскую" -#. item "Shops/Hairdresser" text "Name" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2616 msgid "Shoes" msgstr "Обувь" #. item -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2617 msgid "Edit Shoe Shop" msgstr "Редактировать обувной магазин" -#. item "Shops/Shoes" text "Name" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2622 msgid "Toys" msgstr "Игрушки" #. item -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2623 msgid "Edit Toy Shop" msgstr "Редактировать магазин игрушек" -#. item "Shops/Toys" text "Name" -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2628 msgid "Video" msgstr "Видео" #. item -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2629 msgid "Edit Video Shop" msgstr "Редактировать Магазин видеозаписей" -#. item "Shops/Video" text "Name" -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2634 msgid "Dry Cleaning" msgstr "Химчистка" @@ -18807,10 +20310,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Править химчистку" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Прачечная" @@ -18818,10 +20320,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Править прачечную" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "Товары для активного отдыха" @@ -18829,35 +20330,32 @@ #. item #. -#: build/trans_presets.java:2539 +#: build/trans_presets.java:2650 msgid "Edit Outdoor Shop" msgstr "Править магазин товаров для активного отдыха" -#. item "Shops/Outdoor" text "Name" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2655 msgid "Sports" msgstr "Спорт" #. item -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2656 msgid "Edit Sports Shop" msgstr "Редактировать Спортивный магазин" -#. item "Shops/Sports" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2661 msgid "Optician" msgstr "Оптик" #. item -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2662 msgid "Edit Optician" msgstr "Править оптику" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Наличные" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Банк" @@ -18865,16 +20363,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Править банк" -#. item "Cash/Bank" text "Name" -#. item "Cash/Money Exchange" text "Name" -#: build/trans_presets.java:2561 build/trans_presets.java:2569 +#: build/trans_presets.java:2677 build/trans_presets.java:2686 msgid "Automated Teller Machine" msgstr "Банкомат" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Обмен валют" @@ -18882,5 +20378,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Править обмен валют" @@ -18888,15 +20384,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Править банкомат" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Здоровье" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Врач" @@ -18904,20 +20400,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Править врача" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Стоматолог" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Править стоматологию" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Аптека" @@ -18925,5 +20419,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Править аптеку" @@ -18931,10 +20425,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2711 msgid "Dispensing" msgstr "Отпуск лекарств по рецептам" -#. item "Health/Pharmacy" text "Name" -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2715 msgid "Hospital" msgstr "Больница" @@ -18942,10 +20435,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Править больницу" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "Пункт вызова экстренной помощи" @@ -18954,5 +20447,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "Править пункт вызова экстренной помощи" @@ -18961,20 +20454,20 @@ #. #. -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2727 msgid "Point Number" msgstr "Номер пункта" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2728 msgid "Point Name" msgstr "Название точки" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2730 msgid "Phone Number" msgstr "Номер телефона" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2731 msgid "(Use international code, like +12-345-67890)" msgstr "(Используйте международный код, как например +12-345-67890)" @@ -18982,5 +20475,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2614 +#: build/trans_presets.java:2734 msgid "Veterinary" msgstr "Ветеринар" @@ -18989,55 +20482,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Править ветеринара" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Континент" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Править континент" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "Страна" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Править страну" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "Штат" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Править штат" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Область" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Править область" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2769 msgid "County" msgstr "Графство" #. item -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2770 msgid "Edit County" msgstr "Править графство" @@ -19045,15 +20538,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "Город (более 100 000)" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Править город" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "Город (до 100 000)" @@ -19061,10 +20554,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Править город" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "Пригород" @@ -19072,25 +20565,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Править пригород" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "Село" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Править село" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "Деревня" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Править деревню" @@ -19098,5 +20591,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "Местность" @@ -19104,10 +20597,10 @@ #. item #. -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2811 msgid "Edit Locality" msgstr "Править местность" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2816 msgid "Island" msgstr "Остров" @@ -19115,11 +20608,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Править остров" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "влево" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Редактировать Дача/Коттедж" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Вход в пещеру" @@ -19127,10 +20633,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Править вход в пещеру" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Вершина" @@ -19138,10 +20644,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Править вершину" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Ледник" @@ -19149,10 +20655,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Править ледник" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Вулкан" @@ -19160,70 +20666,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Править вулкан" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Границы" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "Государственная" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Править государственную границу" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "Административная" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "Править административную границу" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2872 msgid "Civil" msgstr "Гражданская" #. item -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2873 msgid "Edit Civil Boundary" msgstr "Править гражданскую границу" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2750 +#: build/trans_presets.java:2878 msgid "Political" msgstr "Политическая" #. item -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2879 msgid "Edit Political Boundary" msgstr "Править политическую границу" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2756 +#: build/trans_presets.java:2884 msgid "National park" msgstr "Национальный парк" #. item -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2885 msgid "Edit National Park Boundary" msgstr "Править национальный парк" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Землепользование" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Дерево" @@ -19232,15 +20738,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Править дерево" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Научное название" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Лесистая местность" @@ -19249,5 +20755,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Править лесистую местность" @@ -19255,17 +20761,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "coniferous" msgstr "Хвойный" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "Лиственный" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "Смешанный" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "Лес" @@ -19274,14 +20780,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Править лес" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "Заповедник" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "Править заповедник" @@ -19289,25 +20795,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2925 msgid "Scree" msgstr "Каменистая осыпь" #. item -#: build/trans_presets.java:2798 +#: build/trans_presets.java:2926 msgid "Edit Scree" msgstr "Редактировать Каменистая осыпь" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2930 msgid "Scrub" msgstr "Кустарник" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Редактировать Кустарник" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "Вырубленный лес" @@ -19315,10 +20821,10 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "Редактировать Вырубленный лес" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "Пустошь" @@ -19326,5 +20832,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Редактировать Здоровье" @@ -19332,5 +20838,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "Двор фермы" @@ -19339,45 +20845,45 @@ #. -#: build/trans_presets.java:2823 +#: build/trans_presets.java:2951 msgid "Edit Farmyard Landuse" msgstr "Править двор фермы" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2956 msgid "Farmland" msgstr "Обрабатываемая земля" #. item -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2957 msgid "Edit Farmland Landuse" msgstr "Править обрабатываемую землю" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2962 msgid "Meadow" msgstr "Луг" #. item -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2963 msgid "Edit Meadow Landuse" msgstr "Редактировать Луг" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2968 msgid "Vineyard" msgstr "Виноградник" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Править виноградник" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2974 msgid "Allotments" msgstr "Огороды" #. item -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2975 msgid "Edit Allotments Landuse" msgstr "Править огороды" @@ -19385,25 +20891,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Сад" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Править сад" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2858 +#: build/trans_presets.java:2986 msgid "Grass" msgstr "Трава" #. item -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2987 msgid "Edit Grass Landuse" msgstr "Править траву" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2864 +#: build/trans_presets.java:2992 msgid "Village Green" msgstr "Село" @@ -19411,10 +20917,10 @@ #. item #. -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2994 msgid "Edit Village Green Landuse" msgstr "Редактировать Село" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2871 +#: build/trans_presets.java:2999 msgid "Common" msgstr "Общее" @@ -19422,20 +20928,20 @@ #. item #. -#: build/trans_presets.java:2873 +#: build/trans_presets.java:3001 msgid "Edit Common" msgstr "Править общее" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:2877 +#: build/trans_presets.java:3005 msgid "Park" msgstr "Парк" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Править парк" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "Спортплощадка" @@ -19443,5 +20949,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "Править спортплощадку" @@ -19449,15 +20955,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Жилая зона" #. item -#: build/trans_presets.java:2891 +#: build/trans_presets.java:3019 msgid "Edit Residential Landuse" msgstr "Править жилую зону" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:3024 msgid "Graveyard" msgstr "Церковное кладбище" @@ -19465,9 +20971,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Править церковное кладбище" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "Кладбище" @@ -19475,39 +20981,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Править кладбище" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "Розничная торговля" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Править розничную торговлю" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:3047 msgid "Commercial" msgstr "Коммерция" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:3048 msgid "Edit Commercial Landuse" msgstr "Править коммерцию" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:3053 msgid "Industrial" msgstr "Промышленность" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Править промышленность" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "Железная дорога" @@ -19515,15 +21021,15 @@ #. item #. -#: build/trans_presets.java:2933 +#: build/trans_presets.java:3061 msgid "Edit Railway Landuse" msgstr "Править ж/д пути" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:2938 +#: build/trans_presets.java:3066 msgid "Military" msgstr "Военное" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "Править военное" @@ -19531,55 +21037,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Стройплощадка" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "Править стройплощадку" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:2951 +#: build/trans_presets.java:3079 msgid "Brownfield" msgstr "Пустырь с развалинами" #. item -#: build/trans_presets.java:2952 +#: build/trans_presets.java:3080 msgid "Edit Brownfield Landuse" msgstr "Править пустырь с развалинами" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:2957 +#: build/trans_presets.java:3085 msgid "Greenfield" msgstr "Пустырь" #. item -#: build/trans_presets.java:2958 +#: build/trans_presets.java:3086 msgid "Edit Greenfield Landuse" msgstr "Править пустырь" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:2963 +#: build/trans_presets.java:3091 msgid "Landfill" msgstr "Свалка" #. item -#: build/trans_presets.java:2964 +#: build/trans_presets.java:3092 msgid "Edit Landfill Landuse" msgstr "Править свалку" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:2969 +#: build/trans_presets.java:3097 msgid "Quarry" msgstr "Карьер" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "Править карьер" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "Мультиполигональное" @@ -19589,5 +21095,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3111 msgid "Edit Multipolygon" msgstr "Править мультиполигональное отношение" @@ -19596,10 +21102,10 @@ #. #. -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3117 msgid "outer segment" msgstr "внешний сегмент" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3118 msgid "inner segment" msgstr "внутренний сегмент" @@ -19607,5 +21113,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "Ограничение на поворот" @@ -19614,5 +21120,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "Править ограничение на поворот" @@ -19620,34 +21126,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "Restriction" msgstr "Ограничение" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_left_turn" msgstr "поворот налево запрещён" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_right_turn" msgstr "поворот направо запрещён" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_straight_on" msgstr "движение прямо запрещено" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_u_turn" msgstr "разворот запрещён" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_right_turn" msgstr "движение только направо" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_left_turn" msgstr "движение только налево" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_straight_on" msgstr "движение только прямо" @@ -19656,15 +21162,15 @@ #. #. -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3131 msgid "from way" msgstr "с улицы" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3004 +#: build/trans_presets.java:3132 msgid "via node or way" msgstr "через точку или линию" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3133 msgid "to way" msgstr "на улицу" @@ -19672,5 +21178,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "Маршрут" @@ -19679,5 +21185,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "Править маршрут" @@ -19685,5 +21191,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "Тип маршрута" @@ -19755,5 +21261,5 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:233 +#: build/trans_presets.java:3141 build/trans_style.java:233 #: build/trans_style.java:683 build/trans_style.java:906 #: build/trans_style.java:914 build/trans_style.java:922 @@ -19762,17 +21268,17 @@ msgstr "велосипедный" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "bus" msgstr "автобусный" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "road" msgstr "трасса" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ferry" msgstr "паромный" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ski" msgstr "лыжный" @@ -19825,5 +21331,5 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:247 +#: build/trans_presets.java:3141 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -19832,13 +21338,13 @@ msgstr "пеший" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "hiking" msgstr "туристический" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "tram" msgstr "трамвайный" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "detour" msgstr "объездной" @@ -19852,10 +21358,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "метро" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "Описание символа" @@ -19863,31 +21369,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3147 msgid "Network" msgstr "Сеть" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "proposed" msgstr "планируемый" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "alternate" msgstr "альтернативный" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "temporary" msgstr "временный" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "connection" msgstr "соединяющий" -#: build/trans_presets.java:3022 +#: build/trans_presets.java:3150 msgid "Color (hex)" msgstr "Цвет (hex)" @@ -19896,30 +21402,30 @@ #. #. -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3153 msgid "route segment" msgstr "сегмент маршрута" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3154 msgid "forward segment" msgstr "сегмент вперёд" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3155 msgid "backward segment" msgstr "сегмент назад" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3028 +#: build/trans_presets.java:3156 msgid "halt point" msgstr "конечная точка" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3029 +#: build/trans_presets.java:3157 msgid "forward halt point" msgstr "конечная вперёд" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3030 +#: build/trans_presets.java:3158 msgid "backward halt point" msgstr "конечная назад" @@ -20357,11 +21863,11 @@ #: build/trans_style.java:627 build/trans_style.java:824 #: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3424 build/trans_style.java:3425 -#: build/trans_style.java:3995 build/trans_style.java:4295 -#: build/trans_style.java:4304 build/trans_style.java:4313 -#: build/trans_style.java:4322 build/trans_style.java:4331 -#: build/trans_style.java:4340 build/trans_style.java:4349 -#: build/trans_style.java:4350 build/trans_style.java:4359 -#: build/trans_style.java:4368 +#: build/trans_style.java:3375 build/trans_style.java:3376 +#: build/trans_style.java:3946 build/trans_style.java:4254 +#: build/trans_style.java:4263 build/trans_style.java:4272 +#: build/trans_style.java:4281 build/trans_style.java:4290 +#: build/trans_style.java:4299 build/trans_style.java:4308 +#: build/trans_style.java:4309 build/trans_style.java:4318 +#: build/trans_style.java:4327 msgid "deprecated" msgstr "уменьшать" @@ -20687,41 +22193,4 @@ msgid "motorroad" msgstr "" - -#. color tertiary -#. -#. 1 -#. 30000 -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. color highway_track -#. -#. 1 -#. 20000 -#. -#. -#. -#. -#. color street -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#: build/trans_style.java:619 build/trans_style.java:635 -#: build/trans_style.java:651 build/trans_style.java:659 -msgid "street" -msgstr "улица" #. color street @@ -22422,5 +23891,5 @@ #. #: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3343 +#: build/trans_style.java:3294 msgid "light_water" msgstr "легкая вода" @@ -23019,55 +24488,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -23081,5 +24501,5 @@ #: build/trans_style.java:2925 build/trans_style.java:2933 #: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:3029 +#: build/trans_style.java:2958 build/trans_style.java:2980 msgid "tourism" msgstr "туризм" @@ -23151,8 +24571,8 @@ #. #. -#: build/trans_style.java:3039 build/trans_style.java:3047 -#: build/trans_style.java:3055 build/trans_style.java:3063 -#: build/trans_style.java:3071 build/trans_style.java:3079 -#: build/trans_style.java:3087 build/trans_style.java:3095 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 +#: build/trans_style.java:3022 build/trans_style.java:3030 +#: build/trans_style.java:3038 build/trans_style.java:3046 msgid "historic" msgstr "исторический" @@ -23223,8 +24643,8 @@ #. #. -#: build/trans_style.java:3104 build/trans_style.java:3112 -#: build/trans_style.java:3120 build/trans_style.java:3128 -#: build/trans_style.java:3176 build/trans_style.java:3184 -#: build/trans_style.java:3282 build/trans_style.java:3290 +#: build/trans_style.java:3055 build/trans_style.java:3063 +#: build/trans_style.java:3071 build/trans_style.java:3079 +#: build/trans_style.java:3127 build/trans_style.java:3135 +#: build/trans_style.java:3233 build/trans_style.java:3241 msgid "green" msgstr "зеленый" @@ -23238,5 +24658,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "карьер" @@ -23250,5 +24670,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "мусорная свалка" @@ -23270,5 +24690,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "водоём" @@ -23282,5 +24702,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "лес" @@ -23294,5 +24714,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "двор фермы" @@ -23315,5 +24735,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "розничная продажа" @@ -23327,5 +24747,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "промышленный" @@ -23339,5 +24759,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "заброшенная застройка" @@ -23351,5 +24771,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "участок для застройки" @@ -23363,5 +24783,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "жд разъезд" @@ -23418,7 +24838,7 @@ #. #. -#: build/trans_style.java:3266 build/trans_style.java:3301 -#: build/trans_style.java:3309 build/trans_style.java:3317 -#: build/trans_style.java:3325 build/trans_style.java:3333 +#: build/trans_style.java:3217 build/trans_style.java:3252 +#: build/trans_style.java:3260 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3284 msgid "military" msgstr "военный" @@ -23432,5 +24852,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "кладбище" @@ -23443,5 +24863,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "пик" @@ -23456,5 +24876,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "ледник" @@ -23468,5 +24888,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "вулкан" @@ -23521,8 +24941,8 @@ #. #. -#: build/trans_style.java:3375 build/trans_style.java:3376 -#: build/trans_style.java:3384 build/trans_style.java:3400 -#: build/trans_style.java:3473 build/trans_style.java:3481 -#: build/trans_style.java:3489 +#: build/trans_style.java:3326 build/trans_style.java:3327 +#: build/trans_style.java:3335 build/trans_style.java:3351 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 msgid "natural" msgstr "природный" @@ -23536,5 +24956,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "кустарник" @@ -23548,20 +24968,8 @@ #. #. -#: build/trans_style.java:3408 +#: build/trans_style.java:3359 msgid "heath" msgstr "здоровье" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#: build/trans_style.java:3416 -msgid "wood" -msgstr "лес" - #. color water #. 1 @@ -23572,5 +24980,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "грязь" @@ -23584,5 +24992,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "пляж" @@ -23660,8 +25068,8 @@ #. #. -#: build/trans_style.java:3505 build/trans_style.java:3513 -#: build/trans_style.java:3521 build/trans_style.java:3529 -#: build/trans_style.java:3537 build/trans_style.java:3545 -#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 +#: build/trans_style.java:3488 build/trans_style.java:3496 +#: build/trans_style.java:3504 build/trans_style.java:3512 msgid "route" msgstr "маршрут" @@ -23709,7 +25117,7 @@ #. #. -#: build/trans_style.java:3571 build/trans_style.java:3579 -#: build/trans_style.java:3587 build/trans_style.java:3595 -#: build/trans_style.java:3603 +#: build/trans_style.java:3522 build/trans_style.java:3530 +#: build/trans_style.java:3538 build/trans_style.java:3546 +#: build/trans_style.java:3554 msgid "boundary" msgstr "граница" @@ -23851,10 +25259,19 @@ #. #. -#: build/trans_style.java:4043 build/trans_style.java:4051 -#: build/trans_style.java:4059 build/trans_style.java:4067 -#: build/trans_style.java:4075 build/trans_style.java:4083 -#: build/trans_style.java:4091 build/trans_style.java:4099 -#: build/trans_style.java:4107 build/trans_style.java:4115 -#: build/trans_style.java:4123 build/trans_style.java:4131 +#. color place +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: 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 +#: build/trans_style.java:4042 build/trans_style.java:4050 +#: build/trans_style.java:4058 build/trans_style.java:4066 +#: build/trans_style.java:4074 build/trans_style.java:4082 +#: build/trans_style.java:4090 msgid "place" msgstr "место" @@ -23902,6 +25319,6 @@ #. #. -#: build/trans_style.java:4248 build/trans_style.java:4255 -#: build/trans_style.java:4262 build/trans_style.java:4269 +#: build/trans_style.java:4207 build/trans_style.java:4214 +#: build/trans_style.java:4221 build/trans_style.java:4228 msgid "address" msgstr "адрес" @@ -24198,9 +25615,106 @@ msgstr "Terraserver Urban" -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Выберите Таблицу d'Assemblage" - -#~ msgid "Adjust the position of the WMS layer (raster images only)" -#~ msgstr "Подогнать позицию WMS слоя (только растровые изображения)" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Прим.: Некоторые изменения произошли из-за загрузки данных на сервер." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Пожалуйста, выберите контуры, у которых углы почти прямые, для применения " +#~ "функции." + +#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Внимание: невозможно разместить диалоговое окно поверх всех окон. " +#~ "Исключение в: {0}" + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Внутренняя ошибка: невозможно проверить условия без слоя. Пожалуйста, " +#~ "создайте отчёт об ошибке." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Нет открытых документов. Нечего сохранять." + +#~ msgid "Delete {1} {0}" +#~ msgstr "Удалить {1} {0}" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Удалить участника отношений {0} {1}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Не удается прочитать каталог с настройками: {0}" + +#~ msgid "nodes" +#~ msgstr "точки" + +#~ msgid "ways" +#~ msgstr "линии" + +#~ msgid "relations" +#~ msgstr "отношения" + +#~ msgid "changesets" +#~ msgstr "наборы изменений" + +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ "Загрузка истории с сервера потерпела неудачу. Подробности:
{0}" + +#~ msgid "Delete Layer" +#~ msgstr "Удалить слой" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "Вы действительно хотите удалить слой ''{0}''?" + +#~ msgid "Delete all" +#~ msgstr "Удалить всё" + +#~ msgid "Authors: {0}" +#~ msgstr "Авторы: {0}" + +#~ msgid "Public" +#~ msgstr "Публичный" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Выбор сделает ваш трэк общественным на сайте openstreetmap.org" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "ЭТО ЭКСПЕРИМЕНТАЛЬНАЯ ВОЗМОЖНОСТЬ. Сохраните вашу работу и проверьте " +#~ "перед загрузкой." + +#~ msgid "Continue anyway" +#~ msgstr "Продолжить в любом случае" + +#~ msgid "Copy Default" +#~ msgstr "Копия поумолчанию" + +#~ msgid "Edit Information Office" +#~ msgstr "Править справочное бюро" + +#~ msgid "Map Type" +#~ msgstr "Тип карты" + +#~ msgid "map" +#~ msgstr "карта" + +#~ msgid "citymap" +#~ msgstr "карта города" + +#~ msgid "hikingmap" +#~ msgstr "карта туристических маршрутов" + +#~ msgid "bicyclemap" +#~ msgstr "карта велодорожек" + +#~ msgid "Board Type" +#~ msgstr "Тип Инфорационного Щита" + +#~ msgid "board" +#~ msgstr "доска информации" #~ msgid "Unknown file extension." @@ -24266,7 +25780,4 @@ #~ msgid "Object" #~ msgstr "Объект" - -#~ msgid "Not implemented yet." -#~ msgstr "Ещё не реализовано." #~ msgid "Revert" @@ -24560,4 +26071,7 @@ #~ msgid "Invalid projection" #~ msgstr "Неправильная проекция" + +#~ msgid "Select Tableau d'Assemblage" +#~ msgstr "Выберите Таблицу d'Assemblage" #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" @@ -24744,6 +26258,6 @@ #~ msgstr "Применить частичное решение" -#~ msgid "image loading..." -#~ msgstr "изображение загружается..." +#~ msgid "Adjust the position of the WMS layer (raster images only)" +#~ msgstr "Подогнать позицию WMS слоя (только растровые изображения)" #~ msgid "No data"